godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-14 13:41:12 +00:00
Code Releases Wiki Activity

Remove inline from constexpr variables

Browse Source
This commit is contained in:
kobewi
2025-04-28 21:09:43 +02:00
parent 67c96c89cc
commit 5125a273dc
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
editor/editor_resource_preview.h
View File

@@ -73,7 +73,7 @@ public:
class EditorResourcePreview : public Node { class EditorResourcePreview : public Node {
GDCLASS(EditorResourcePreview, Node); GDCLASS(EditorResourcePreview, Node);
inline static constexpr int CURRENT_METADATA_VERSION = 1; // Increment this number to invalidate all previews. static constexpr int CURRENT_METADATA_VERSION = 1; // Increment this number to invalidate all previews.
inline static EditorResourcePreview *singleton = nullptr; inline static EditorResourcePreview *singleton = nullptr;
struct QueueItem { struct QueueItem {

4
editor/plugins/editor_context_menu_plugin.h
View File

@@ -43,7 +43,7 @@ class EditorContextMenuPlugin : public RefCounted {
friend class EditorContextMenuPluginManager; friend class EditorContextMenuPluginManager;
inline static constexpr int MAX_ITEMS = 100; static constexpr int MAX_ITEMS = 100;
public: public:
enum ContextMenuSlot { enum ContextMenuSlot {
@@ -55,7 +55,7 @@ public:
CONTEXT_SLOT_SCENE_TABS, CONTEXT_SLOT_SCENE_TABS,
CONTEXT_SLOT_2D_EDITOR, CONTEXT_SLOT_2D_EDITOR,
}; };
inline static constexpr int BASE_ID = 2000; static constexpr int BASE_ID = 2000;
private: private:
int slot = -1; int slot = -1;

2
scene/gui/color_picker_shape.h
View File

@@ -107,7 +107,7 @@ public:
class ColorPickerShapeWheel : public ColorPickerShape { class ColorPickerShapeWheel : public ColorPickerShape {
GDCLASS(ColorPickerShapeWheel, ColorPickerShape); GDCLASS(ColorPickerShapeWheel, ColorPickerShape);
inline static constexpr float WHEEL_RADIUS = 0.42; static constexpr float WHEEL_RADIUS = 0.42;
MarginContainer *wheel_margin = nullptr; MarginContainer *wheel_margin = nullptr;
Control *wheel = nullptr; Control *wheel = nullptr;

2
scene/resources/animation.h
View File

@@ -43,7 +43,7 @@ public:
typedef uint32_t TypeHash; typedef uint32_t TypeHash;
static inline String PARAMETERS_BASE_PATH = "parameters/"; static inline String PARAMETERS_BASE_PATH = "parameters/";
static inline constexpr real_t DEFAULT_STEP = 1.0 / 30; static constexpr real_t DEFAULT_STEP = 1.0 / 30;
enum TrackType : uint8_t { enum TrackType : uint8_t {
TYPE_VALUE, // Set a value in a property, can be interpolated. TYPE_VALUE, // Set a value in a property, can be interpolated.