Merge pull request godotengine#85227 from KoBeWi/when_two_IDs_fight_t…

…he_editor_suffers Fix crash caused by conflicting menu option IDs
Deozaan · Nov 22, 2023 · fa4a653 · fa4a653
2 parents ee14dc6 + c6fec68
commit fa4a653
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/editor/editor_resource_picker.h b/editor/editor_resource_picker.h
@@ -146,8 +146,8 @@ class EditorScriptPicker : public EditorResourcePicker {
 	GDCLASS(EditorScriptPicker, EditorResourcePicker);
 
 	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;
@@ -169,7 +169,7 @@ class EditorShaderPicker : public EditorResourcePicker {
 	GDCLASS(EditorShaderPicker, EditorResourcePicker);
 
 	enum ExtraMenuOption {
-		OBJ_MENU_NEW_SHADER = 10,
+		OBJ_MENU_NEW_SHADER = 50,
 	};
 
 	ShaderMaterial *edited_material = nullptr;