[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24913] trunk/blender/source/gameengine/ Ketsji/KX_Scene.cpp: BGE: allow using dynamic loaded mesh in replaceMesh for soft body.

[Benoit Bolsee]

Revision: 24913
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24913
Author:   ben2610
Date:     2009-11-26 10:40:37 +0100 (Thu, 26 Nov 2009)

Log Message:
-----------
BGE: allow using dynamic loaded mesh in replaceMesh for soft body. This is a 
quick fix, it doesn't work yet on skinned mesh.

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-11-26 06:32:43 UTC 
(rev 24912)
+++ trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp 2009-11-26 09:40:37 UTC 
(rev 24913)
@@ -1106,8 +1106,10 @@
 
                        
                        if (oldblendobj==NULL) {
-                               std::cout << "warning: ReplaceMesh() new mesh 
is not used in an object from the current scene, you will get incorrect 
behavior" << std::endl;
-                               bHasShapeKey= bHasDvert= 
bHasArmature=bHasModifier=bHasSoftBody= false;
+                               if (bHasModifier || bHasShapeKey || bHasDvert 
|| bHasArmature) {
+                                       std::cout << "warning: ReplaceMesh() 
new mesh is not used in an object from the current scene, you will get 
incorrect behavior" << std::endl;
+                                       bHasShapeKey= bHasDvert= 
bHasArmature=bHasModifier= false;
+                               }
                        }
                        
                        if (bHasModifier)


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs