godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

-make sure instance placeholder works with duplicate(), fixes #3378

Browse Source
This commit is contained in:
Juan Linietsky
2016-01-22 19:36:40 -03:00
parent 84d7a559e5
commit b30839fb08
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scene/main/node.cpp
View File

@@ -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);