Revision: 19936
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19936
Author: erwin
Date: 2009-04-27 06:21:05 +0200 (Mon, 27 Apr 2009)
Log Message:
-----------
Lower the vertex welding threshold, for removing duplicate/nearby vertices for
soft bodies (this broke susanne softbody regression test)
Modified Paths:
--------------
trunk/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
trunk/blender/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp
trunk/blender/source/gameengine/Ketsji/KX_Scene.h
Modified: trunk/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
2009-04-27 00:49:01 UTC (rev 19935)
+++ trunk/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
2009-04-27 04:21:05 UTC (rev 19936)
@@ -38,7 +38,7 @@
#include "KX_BlenderSceneConverter.h"
#include "KX_ConvertActuators.h"
-
+#include "SND_Scene.h"
// Actuators
//SCA logiclibrary native logicbricks
#include "SCA_PropertyActuator.h"
Modified: trunk/blender/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
2009-04-27 00:49:01 UTC (rev 19935)
+++ trunk/blender/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
2009-04-27 04:21:05 UTC (rev 19936)
@@ -905,7 +905,7 @@
// Soft bodies require welding. Only avoid
remove doubles for non-soft bodies!
if (objprop->m_softbody)
-
shapeInfo->setVertexWeldingThreshold1(0.01f); //todo: expose this to the UI
+
shapeInfo->setVertexWeldingThreshold1(0.0001f); //todo: expose this to the UI
bm = shapeInfo->CreateBulletShape();
//no moving concave meshes, so don't bother
calculating inertia
Modified: trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp 2009-04-27 00:49:01 UTC
(rev 19935)
+++ trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp 2009-04-27 04:21:05 UTC
(rev 19936)
@@ -34,7 +34,7 @@
#include "KX_Scene.h"
#include "MT_assert.h"
-
+#include "SND_Scene.h"
#include "KX_KetsjiEngine.h"
#include "KX_BlenderMaterial.h"
#include "RAS_IPolygonMaterial.h"
Modified: trunk/blender/source/gameengine/Ketsji/KX_Scene.h
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_Scene.h 2009-04-27 00:49:01 UTC
(rev 19935)
+++ trunk/blender/source/gameengine/Ketsji/KX_Scene.h 2009-04-27 04:21:05 UTC
(rev 19936)
@@ -43,7 +43,7 @@
#include "SG_IObject.h"
#include "SCA_IScene.h"
#include "MT_Transform.h"
-#include "SND_Scene.h"
+
#include "RAS_FramingManager.h"
#include "RAS_Rect.h"
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
