[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60294] branches/soc-2013-rigid_body_sim/ source/blender/blenkernel/intern/rigidbody.c: rigidbody: Fix crash with meshes that have both quads and tirs/ngons

[Sergej Reich]

Revision: 60294
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60294
Author:   sergof
Date:     2013-09-21 21:26:30 +0000 (Sat, 21 Sep 2013)
Log Message:
-----------
rigidbody: Fix crash with meshes that have both quads and tirs/ngons

Triangles weren't counted right, silly copy paste mistake.

Modified Paths:
--------------
    branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/rigidbody.c

Modified: branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/rigidbody.c
===================================================================
--- branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/rigidbody.c	2013-09-21 10:46:58 UTC (rev 60293)
+++ branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/rigidbody.c	2013-09-21 21:26:30 UTC (rev 60294)
@@ -317,8 +317,8 @@
 			int i;
 
 			/* count triangles */
-			for (i = 0; (i < totface) && (mface); i++) {
-				(mface->v4) ? (tottris += 2) : (tottris += 1);
+			for (i = 0; i < totface; i++) {
+				(mface[i].v4) ? (tottris += 2) : (tottris += 1);
 			}
 
 			/* init mesh data for collision shape */