Browse Source

Merge pull request #85227 from KoBeWi/when_two_IDs_fight_the_editor_suffers

Fix crash caused by conflicting menu option IDs
Rémi Verschelde 1 year ago
parent
commit
fa4a65387e
1 changed files with 3 additions and 3 deletions
  1. 3 3
      editor/editor_resource_picker.h

+ 3 - 3
editor/editor_resource_picker.h

@@ -146,8 +146,8 @@ class EditorScriptPicker : public EditorResourcePicker {
 	GDCLASS(EditorScriptPicker, EditorResourcePicker);
 	GDCLASS(EditorScriptPicker, EditorResourcePicker);
 
 
 	enum ExtraMenuOption {
 	enum ExtraMenuOption {
-		OBJ_MENU_NEW_SCRIPT = 10,
-		OBJ_MENU_EXTEND_SCRIPT = 11
+		OBJ_MENU_NEW_SCRIPT = 50,
+		OBJ_MENU_EXTEND_SCRIPT = 51
 	};
 	};
 
 
 	Node *script_owner = nullptr;
 	Node *script_owner = nullptr;
@@ -169,7 +169,7 @@ class EditorShaderPicker : public EditorResourcePicker {
 	GDCLASS(EditorShaderPicker, EditorResourcePicker);
 	GDCLASS(EditorShaderPicker, EditorResourcePicker);
 
 
 	enum ExtraMenuOption {
 	enum ExtraMenuOption {
-		OBJ_MENU_NEW_SHADER = 10,
+		OBJ_MENU_NEW_SHADER = 50,
 	};
 	};
 
 
 	ShaderMaterial *edited_material = nullptr;
 	ShaderMaterial *edited_material = nullptr;