summaryrefslogtreecommitdiffstats
path: root/scene/3d/visual_instance.cpp
diff options
context:
space:
mode:
authormarynate <mary.w.nate@gmail.com>2014-05-13 13:24:26 +0800
committermarynate <mary.w.nate@gmail.com>2014-05-13 13:25:24 +0800
commit7eb86f2fbc8e75f76473dd6a0869611cf5c0cfb6 (patch)
tree203fbed40cd9a4875127c309e7240f4dbbb5d012 /scene/3d/visual_instance.cpp
parent45a509282e912d85c46b40974a2deb926be5be42 (diff)
downloadredot-engine-7eb86f2fbc8e75f76473dd6a0869611cf5c0cfb6.tar.gz
Add 'mesh/skeleton' property to MeshInstance to decouple mesh->skeleton from child parent constraint
Diffstat (limited to 'scene/3d/visual_instance.cpp')
-rw-r--r--scene/3d/visual_instance.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/scene/3d/visual_instance.cpp b/scene/3d/visual_instance.cpp
index 9419996187..96f16ab8c8 100644
--- a/scene/3d/visual_instance.cpp
+++ b/scene/3d/visual_instance.cpp
@@ -65,10 +65,12 @@ void VisualInstance::_notification(int p_what) {
VisualServer::get_singleton()->instance_set_room(instance,room->get_instance());
}
- // CHECK SKELETON
+ // CHECK SKELETON => moving skeleton attaching logic to MeshInstance
+ /*
Skeleton *skeleton=get_parent()?get_parent()->cast_to<Skeleton>():NULL;
if (skeleton)
VisualServer::get_singleton()->instance_attach_skeleton( instance, skeleton->get_skeleton() );
+ */
VisualServer::get_singleton()->instance_set_scenario( instance, get_world()->get_scenario() );