diff options
| author | Rémi Verschelde | 2017-07-28 11:16:21 +0200 |
|---|---|---|
| committer | GitHub | 2017-07-28 11:16:21 +0200 |
| commit | e224528710f5ab9e7ad266a18e737b3e6feadf6f (patch) | |
| tree | b5864b7bf093add3ea7f56440cb78cf426d4f4ee /editor | |
| parent | 1b5a6a800ccada6ae46314bdd638c2d523a41aa8 (diff) | |
| parent | 9a838568b6366902b9fde8a00ab18b438924fb01 (diff) | |
| download | godot-e224528710f5ab9e7ad266a18e737b3e6feadf6f.tar.gz godot-e224528710f5ab9e7ad266a18e737b3e6feadf6f.tar.zst godot-e224528710f5ab9e7ad266a18e737b3e6feadf6f.zip | |
Merge pull request #9943 from kubecz3k/fix-inh-inst-edit
correct RMB options for instanced inherited scene
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/scene_tree_dock.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp index 57ab93182..47a918538 100644 --- a/editor/scene_tree_dock.cpp +++ b/editor/scene_tree_dock.cpp @@ -37,9 +37,9 @@ #include "editor/plugins/spatial_editor_plugin.h" #include "editor_node.h" #include "editor_settings.h" -#include "project_settings.h" #include "multi_node_edit.h" #include "os/keyboard.h" +#include "project_settings.h" #include "scene/main/viewport.h" #include "scene/resources/packed_scene.h" #include "script_editor_debugger.h" @@ -1885,7 +1885,7 @@ void SceneTreeDock::_tree_rmb(const Vector2 &p_menu_pos) { if (is_external) { bool is_inherited = selection[0]->get_scene_inherited_state() != NULL; bool is_top_level = selection[0]->get_owner() == NULL; - if (is_inherited) { + if (is_inherited && is_top_level) { menu->add_separator(); menu->add_item(TTR("Clear Inheritance"), TOOL_SCENE_CLEAR_INHERITANCE); menu->add_icon_item(get_icon("Load", "EditorIcons"), TTR("Open in Editor"), TOOL_SCENE_OPEN_INHERITED); |