diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-11-22 21:57:14 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-11-22 21:57:14 +0100 |
| commit | fa4a65387ea41506ecc519fc61a06da110dce51c (patch) | |
| tree | 3c544d882ec90cd0b438129920c94106db0d5b5f | |
| parent | ee14dc6ce5d9f72c25bad3337bb568997e09b6a8 (diff) | |
| parent | c6fec68a3e62934f9eb89d49d8a0ae9c08c2fcbc (diff) | |
| download | redot-engine-fa4a65387ea41506ecc519fc61a06da110dce51c.tar.gz | |
Merge pull request #85227 from KoBeWi/when_two_IDs_fight_the_editor_suffers
Fix crash caused by conflicting menu option IDs
| -rw-r--r-- | editor/editor_resource_picker.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/editor/editor_resource_picker.h b/editor/editor_resource_picker.h index 0046354861..35703bcbeb 100644 --- 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; |