[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60282] branches/soc-2013-rigid_body_sim/ intern/rigidbody/rb_bullet_api.cpp: rigidbody: Fix changing to a deforming collision shape during simulation

[Sergej Reich]

Revision: 60282
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60282
Author:   sergof
Date:     2013-09-21 05:12:02 +0000 (Sat, 21 Sep 2013)
Log Message:
-----------
rigidbody: Fix changing to a deforming collision shape during simulation

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 05:12:00 UTC (rev 60281)
+++ branches/soc-2013-rigid_body_sim/intern/rigidbody/rb_bullet_api.cpp	2013-09-21 05:12:02 UTC (rev 60282)
@@ -951,7 +951,8 @@
 
 void RB_shape_trimesh_update(rbCollisionShape *shape, float *vertices, int num_verts, int vert_stride, float min[3], float max[3])
 {
-	assert(num_verts == shape->mesh->num_vertices);
+	if (num_verts != shape->mesh->num_vertices)
+		return;
 	
 	for (int i = 0; i < num_verts; i++) {
 		float *vert = (float*)(((char*)vertices + i * vert_stride));