Revision: 19861
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19861
Author:   ben2610
Date:     2009-04-21 23:33:03 +0200 (Tue, 21 Apr 2009)

Log Message:
-----------
BGE bug #18521 fixed: Dupligroups + Bullet Softbodies are broken.

Modified Paths:
--------------
    trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp

Modified: trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp 2009-04-21 20:03:39 UTC 
(rev 19860)
+++ trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp 2009-04-21 21:33:03 UTC 
(rev 19861)
@@ -717,12 +717,13 @@
                // set the replica's relative scale with the rootnode's scale
                replica->NodeSetRelativeScale(newscale);
 
-               MT_Matrix3x3 newori = groupobj->NodeGetWorldOrientation() * 
gameobj->NodeGetWorldOrientation();
-               replica->NodeSetLocalOrientation(newori);
                MT_Point3 offset(group->dupli_ofs);
                MT_Point3 newpos = groupobj->NodeGetWorldPosition() + 
                        newscale*(groupobj->NodeGetWorldOrientation() * 
(gameobj->NodeGetWorldPosition()-offset));
                replica->NodeSetLocalPosition(newpos);
+               // set the orientation after position for softbody!
+               MT_Matrix3x3 newori = groupobj->NodeGetWorldOrientation() * 
gameobj->NodeGetWorldOrientation();
+               replica->NodeSetLocalOrientation(newori);
 
                replica->GetSGNode()->UpdateWorldData(0);
                replica->GetSGNode()->SetBBox(gameobj->GetSGNode()->BBox());


_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to