[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60275] branches/soc-2013-rigid_body_sim/ intern/rigidbody/rb_bullet_api.cpp: rigidbody: Disable internal edge info

[Sergej Reich]

Revision: 60275
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60275
Author:   sergof
Date:     2013-09-21 05:11:49 +0000 (Sat, 21 Sep 2013)
Log Message:
-----------
rigidbody: Disable internal edge info

There is a conflict with using it and compound shapes at the same time.
Since we wrap all shapes in compounds, it has no effect.

Modified Paths:
--------------
    branches/soc-2013-rigid_body_sim/intern/rigidbody/rb_bullet_api.cpp

Modified: branches/soc-2013-rigid_body_sim/intern/rigidbody/rb_bullet_api.cpp
===================================================================
--- branches/soc-2013-rigid_body_sim/intern/rigidbody/rb_bullet_api.cpp	2013-09-21 03:36:16 UTC (rev 60274)
+++ branches/soc-2013-rigid_body_sim/intern/rigidbody/rb_bullet_api.cpp	2013-09-21 05:11:49 UTC (rev 60275)
@@ -239,7 +239,7 @@
 
 	RB_dworld_set_gravity(world, gravity);
 	
-	gContactAddedCallback = contactAddedCallback;
+//	gContactAddedCallback = contactAddedCallback;
 	
 	// HACK set debug drawer, this is only temporary
 	btIDebugDraw *debugDrawer = new rbDebugDraw();
@@ -911,7 +911,7 @@
 	btBvhTriangleMeshShape *unscaledShape = new btBvhTriangleMeshShape(tmesh, true, true);
 	
 	shape->triangle_info_map = new btTriangleInfoMap();
-	btGenerateInternalEdgeInfo(unscaledShape, shape->triangle_info_map);
+//	btGenerateInternalEdgeInfo(unscaledShape, shape->triangle_info_map);
 	
 	shape->cshape = new btScaledBvhTriangleMeshShape(unscaledShape, btVector3(1.0f, 1.0f, 1.0f));
 	shape->mesh = tmesh;