godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #85227 from KoBeWi/when_two_IDs_fight_the_editor_suffers 

Fix crash caused by conflicting menu option IDs
This commit is contained in:
Rémi Verschelde 2023-11-22 21:57:14 +01:00
parent ee14dc6ce5 c6fec68a3e
commit fa4a65387e
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
editor/editor_resource_picker.h
View File

@ -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;