godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Fix crash caused by conflicting menu option IDs

This commit is contained in:
kobewi 2023-11-22 17:28:40 +01:00
parent 923ef2b46a
commit c6fec68a3e
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); GDCLASS(EditorScriptPicker, EditorResourcePicker);
enum ExtraMenuOption { enum ExtraMenuOption {
OBJ_MENU_NEW_SCRIPT = 10, OBJ_MENU_NEW_SCRIPT = 50,
OBJ_MENU_EXTEND_SCRIPT = 11 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;