From b30839fb08e4e17ca9ba3a76aa46bb263c62e7b6 Mon Sep 17 00:00:00 2001
From: Juan Linietsky
Date: Fri, 22 Jan 2016 19:36:40 -0300
Subject: -make sure instance placeholder works with duplicate(), fixes #3378

---
 scene/main/node.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'scene/main/node.cpp')

diff --git a/scene/main/node.cpp b/scene/main/node.cpp
index 191e3ec04..450578a24 100644
--- a/scene/main/node.cpp
+++ b/scene/main/node.cpp
@@ -33,6 +33,7 @@
 #include "scene/resources/packed_scene.h"
 #include "io/resource_loader.h"
 #include "viewport.h"
+#include "instance_placeholder.h"
 
 VARIANT_ENUM_CAST(Node::PauseMode);
 
@@ -1471,7 +1472,14 @@ Node *Node::duplicate(bool p_use_instancing) const {
 
 	bool instanced=false;
 
-	if (p_use_instancing && get_filename()!=String()) {
+	if (cast_to<InstancePlaceholder>()) {
+
+		const InstancePlaceholder *ip = cast_to<const InstancePlaceholder>();
+		InstancePlaceholder *nip = memnew( InstancePlaceholder );
+		nip->set_instance_path( ip->get_instance_path() );
+		node=nip;
+
+	} else if (p_use_instancing && get_filename()!=String()) {
 
 		Ref<PackedScene> res = ResourceLoader::load(get_filename());
 		ERR_FAIL_COND_V(res.is_null(),NULL);
-- 
cgit v1.2.3-70-g09d2