summaryrefslogtreecommitdiff
path: root/servers/visual
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2017-08-07 22:18:12 -0300
committerJuan Linietsky <reduzio@gmail.com>2017-08-07 22:18:12 -0300
commit2a6cdfaf912c9b0903903e3fc035f7c708cb9ae0 (patch)
tree8cb1e9feb0421ede1c7e4746c4e9cbefa16b1f70 /servers/visual
parentbb47bca1f6184abe9ee7bb8b683922ab8388123f (diff)
-Fixed BoneAttachment delay, closes #3966
-Fixed skeleton crash, probably fixes other issues
Diffstat (limited to 'servers/visual')
-rw-r--r--servers/visual/visual_server_scene.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/servers/visual/visual_server_scene.cpp b/servers/visual/visual_server_scene.cpp
index 56a596de55..11a9c8c9c1 100644
--- a/servers/visual/visual_server_scene.cpp
+++ b/servers/visual/visual_server_scene.cpp
@@ -880,13 +880,13 @@ void VisualServerScene::instance_attach_skeleton(RID p_instance, RID p_skeleton)
return;
if (instance->skeleton.is_valid()) {
- VSG::storage->instance_remove_skeleton(p_skeleton, instance);
+ VSG::storage->instance_remove_skeleton(instance->skeleton, instance);
}
instance->skeleton = p_skeleton;
if (instance->skeleton.is_valid()) {
- VSG::storage->instance_add_skeleton(p_skeleton, instance);
+ VSG::storage->instance_add_skeleton(instance->skeleton, instance);
}
_instance_queue_update(instance, true);