summaryrefslogtreecommitdiff
path: root/scene
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2015-11-18 19:33:28 -0300
committerJuan Linietsky <reduzio@gmail.com>2015-11-18 19:33:28 -0300
commit734e3751c604d560b20316f1abea6886dc2eb08a (patch)
treea96e9d3cafd31b928f87e79069b7bd875917b6c6 /scene
parent6de941f21c6d6441846049c1596ee0282ab01b2f (diff)
parent957baf48dc86c6f4c6d00b74d384d7d7e636104b (diff)
Merge pull request #2720 from SaracenOne/bone_attachment_fix
BoneAttachment fix.
Diffstat (limited to 'scene')
-rw-r--r--scene/3d/skeleton.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/3d/skeleton.cpp b/scene/3d/skeleton.cpp
index 4712ba308a..cb81228dff 100644
--- a/scene/3d/skeleton.cpp
+++ b/scene/3d/skeleton.cpp
@@ -250,7 +250,7 @@ void Skeleton::_notification(int p_what) {
ERR_CONTINUE(!obj);
Spatial *sp = obj->cast_to<Spatial>();
ERR_CONTINUE(!sp);
- sp->set_transform(b.pose_global * b.rest_global_inverse);
+ sp->set_transform(b.pose_global);
}
}