[Bf-blender-cvs] [0ab59d9] master: Clean up of dead code.

Bastien Montagne noreply at git.blender.org
Wed Jul 16 16:27:09 CEST 2014


Commit: 0ab59d9a32c92e0088a74bf1925388c6e100f337
Author: Bastien Montagne
Date:   Wed Jul 16 16:25:41 2014 +0200
https://developer.blender.org/rB0ab59d9a32c92e0088a74bf1925388c6e100f337

Clean up of dead code.

dm can’t be NULL here (found by Coverity).

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

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

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

diff --git a/source/blender/blenkernel/intern/rigidbody.c b/source/blender/blenkernel/intern/rigidbody.c
index 2aaf8ad..114a953 100644
--- a/source/blender/blenkernel/intern/rigidbody.c
+++ b/source/blender/blenkernel/intern/rigidbody.c
@@ -522,10 +522,10 @@ void BKE_rigidbody_calc_volume(Object *ob, float *r_vol)
 			
 				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);
 				
 				if (totvert > 0 && totface > 0) {
 					BKE_mesh_calc_volume(mvert, totvert, mface, totface, &volume, NULL);
@@ -605,10 +605,10 @@ void BKE_rigidbody_calc_center_of_mass(Object *ob, float r_com[3])
 			
 				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);
 				
 				if (totvert > 0 && totface > 0) {
 					BKE_mesh_calc_volume(mvert, totvert, mface, totface, NULL, r_com);




More information about the Bf-blender-cvs mailing list