From 6d036c5a3ac27b3518b0f496caea437cbfc2211e Mon Sep 17 00:00:00 2001 From: lawnjelly Date: Mon, 22 Apr 2024 06:57:52 +0100 Subject: [PATCH] Fix `spatial_editor_plugin` enum * The `view_mesh_stats` feature introduced a new enum value `VIEW_SLECTED_INFO` within the unnamed `VIEW` enum. * This turns out to be saved somehow, which means the view settings can get out of sync when reloading the project in an older version of the editor. * The solution is simply to move the new value to the end of the enum so there are no conflicts. --- editor/plugins/spatial_editor_plugin.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/editor/plugins/spatial_editor_plugin.h b/editor/plugins/spatial_editor_plugin.h index 3f0587a09be..b448cce9ee9 100644 --- a/editor/plugins/spatial_editor_plugin.h +++ b/editor/plugins/spatial_editor_plugin.h @@ -184,6 +184,10 @@ class SpatialEditorViewport : public Control { friend class SpatialEditor; friend class ViewportNavigationControl; friend class ViewportRotationControl; + + // These values are serialized, so if adding new values + // add to the bottom to preserve compatibility between + // editor versions. enum { VIEW_TOP, @@ -204,7 +208,6 @@ class SpatialEditorViewport : public Control { VIEW_AUDIO_DOPPLER, VIEW_GIZMOS, VIEW_INFORMATION, - VIEW_SELECTED_INFO, VIEW_FPS, VIEW_DISPLAY_NORMAL, VIEW_DISPLAY_WIREFRAME, @@ -214,6 +217,7 @@ class SpatialEditorViewport : public Control { VIEW_CINEMATIC_PREVIEW, VIEW_AUTO_ORTHOGONAL, VIEW_PORTAL_CULLING, + VIEW_SELECTED_INFO, }; enum ViewType {