Skip to content

Commit 5125a27

Browse files
committed
Remove inline from constexpr variables
1 parent 67c96c8 commit 5125a27

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

editor/editor_resource_preview.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class EditorResourcePreviewGenerator : public RefCounted {
7373
class EditorResourcePreview : public Node {
7474
GDCLASS(EditorResourcePreview, Node);
7575

76-
inline static constexpr int CURRENT_METADATA_VERSION = 1; // Increment this number to invalidate all previews.
76+
static constexpr int CURRENT_METADATA_VERSION = 1; // Increment this number to invalidate all previews.
7777
inline static EditorResourcePreview *singleton = nullptr;
7878

7979
struct QueueItem {

editor/plugins/editor_context_menu_plugin.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class EditorContextMenuPlugin : public RefCounted {
4343

4444
friend class EditorContextMenuPluginManager;
4545

46-
inline static constexpr int MAX_ITEMS = 100;
46+
static constexpr int MAX_ITEMS = 100;
4747

4848
public:
4949
enum ContextMenuSlot {
@@ -55,7 +55,7 @@ class EditorContextMenuPlugin : public RefCounted {
5555
CONTEXT_SLOT_SCENE_TABS,
5656
CONTEXT_SLOT_2D_EDITOR,
5757
};
58-
inline static constexpr int BASE_ID = 2000;
58+
static constexpr int BASE_ID = 2000;
5959

6060
private:
6161
int slot = -1;

scene/gui/color_picker_shape.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ class ColorPickerShapeRectangle : public ColorPickerShape {
107107
class ColorPickerShapeWheel : public ColorPickerShape {
108108
GDCLASS(ColorPickerShapeWheel, ColorPickerShape);
109109

110-
inline static constexpr float WHEEL_RADIUS = 0.42;
110+
static constexpr float WHEEL_RADIUS = 0.42;
111111

112112
MarginContainer *wheel_margin = nullptr;
113113
Control *wheel = nullptr;

scene/resources/animation.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class Animation : public Resource {
4343
typedef uint32_t TypeHash;
4444

4545
static inline String PARAMETERS_BASE_PATH = "parameters/";
46-
static inline constexpr real_t DEFAULT_STEP = 1.0 / 30;
46+
static constexpr real_t DEFAULT_STEP = 1.0 / 30;
4747

4848
enum TrackType : uint8_t {
4949
TYPE_VALUE, // Set a value in a property, can be interpolated.

0 commit comments

Comments
 (0)