summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkobewi <kobewi4e@gmail.com>2023-11-22 17:28:40 +0100
committerkobewi <kobewi4e@gmail.com>2023-11-22 17:28:40 +0100
commitc6fec68a3e62934f9eb89d49d8a0ae9c08c2fcbc (patch)
tree1a34e3a184bf95c68a524082f780473a07b1e3c6
parent923ef2b46a04e8f54c0a60bae8a0a6269fa52ed2 (diff)
downloadredot-engine-c6fec68a3e62934f9eb89d49d8a0ae9c08c2fcbc.tar.gz
Fix crash caused by conflicting menu option IDs
-rw-r--r--editor/editor_resource_picker.h6
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;