summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2017-02-02 08:13:51 +0100
committerGitHub <noreply@github.com>2017-02-02 08:13:51 +0100
commit53c4dfe857e671f4e53d9317a77dc8a82bf91505 (patch)
tree370620903351c469675e3e22d7a493077ccb19b1 /tools
parent39f11ffc5145a534466b3be2651852a828e59707 (diff)
parente4cc483f4ca67d09260611192aeb4c269081835e (diff)
Merge pull request #7670 from RandomShaper/load-placeholder-dup
Replicate load-as-placeholder state on node duplication
Diffstat (limited to 'tools')
-rw-r--r--tools/editor/scene_tree_dock.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/editor/scene_tree_dock.cpp b/tools/editor/scene_tree_dock.cpp
index b3e4c8ed70..96b6686e2a 100644
--- a/tools/editor/scene_tree_dock.cpp
+++ b/tools/editor/scene_tree_dock.cpp
@@ -768,6 +768,7 @@ Node *SceneTreeDock::_duplicate(Node *p_node, Map<Node*,Node*> &duplimap) {
ERR_FAIL_COND_V(!sd.is_valid(),NULL);
node = sd->instance(PackedScene::GEN_EDIT_STATE_INSTANCE);
ERR_FAIL_COND_V(!node,NULL);
+ node->set_scene_instance_load_placeholder(p_node->get_scene_instance_load_placeholder());
//node->generate_instance_state();
} else {
Object *obj = ClassDB::instance(p_node->get_class());