Skip to content

Commit

Permalink
Fix crash caused by conflicting menu option IDs
Browse files Browse the repository at this point in the history
  • Loading branch information
KoBeWi committed Nov 22, 2023
1 parent 923ef2b commit c6fec68
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions editor/editor_resource_picker.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down

0 comments on commit c6fec68

Please sign in to comment.