[Bf-blender-cvs] [11e03ee] master: Cleanup: dead code

[Campbell Barton]

Commit: 11e03eea4e9e9447aa9d5c09c6fefd92029e2646
Author: Campbell Barton
Date:   Thu Jul 17 08:25:48 2014 +1000
https://developer.blender.org/rB11e03eea4e9e9447aa9d5c09c6fefd92029e2646

Cleanup: dead code

===================================================================

M	source/blender/blenkernel/intern/rigidbody.c

===================================================================

diff --git a/source/blender/blenkernel/intern/rigidbody.c b/source/blender/blenkernel/intern/rigidbody.c
index 114a953..8c7d6e9 100644
--- a/source/blender/blenkernel/intern/rigidbody.c
+++ b/source/blender/blenkernel/intern/rigidbody.c
@@ -288,10 +288,10 @@ static rbCollisionShape *rigidbody_get_shape_trimesh_from_mesh(Object *ob)
 
 		DM_ensure_tessface(dm);
 
-		mvert   = (dm) ? dm->getVertArray(dm) : NULL;
-		totvert = (dm) ? dm->getNumVerts(dm) : 0;
-		mface   = (dm) ? dm->getTessFaceArray(dm) : NULL;
-		totface = (dm) ? dm->getNumTessFaces(dm) : 0;
+		mvert   = dm->getVertArray(dm);
+		totvert = dm->getNumVerts(dm);
+		mface   = dm->getTessFaceArray(dm);
+		totface = dm->getNumTessFaces(dm);
 
 		/* sanity checking - potential case when no data will be present */
 		if ((totvert == 0) || (totface == 0)) {
@@ -345,7 +345,7 @@ static rbCollisionShape *rigidbody_get_shape_trimesh_from_mesh(Object *ob)
 		}
 
 		/* cleanup temp data */
-		if (dm && ob->rigidbody_object->mesh_source == RBO_MESH_BASE) {
+		if (ob->rigidbody_object->mesh_source == RBO_MESH_BASE) {
 			dm->release(dm);
 		}
 	}
@@ -532,7 +532,7 @@ void BKE_rigidbody_calc_volume(Object *ob, float *r_vol)
 				}
 				
 				/* cleanup temp data */
-				if (dm && ob->rigidbody_object->mesh_source == RBO_MESH_BASE) {
+				if (ob->rigidbody_object->mesh_source == RBO_MESH_BASE) {
 					dm->release(dm);
 				}
 			}
@@ -615,7 +615,7 @@ void BKE_rigidbody_calc_center_of_mass(Object *ob, float r_com[3])
 				}
 				
 				/* cleanup temp data */
-				if (dm && ob->rigidbody_object->mesh_source == RBO_MESH_BASE) {
+				if (ob->rigidbody_object->mesh_source == RBO_MESH_BASE) {
 					dm->release(dm);
 				}
 			}