[Bf-blender-cvs] [7853cb3] master: Remove redundant addition in BKE_mesh_calc_volume

Campbell Barton noreply at git.blender.org
Wed Aug 5 12:32:09 CEST 2015


Commit: 7853cb3c5a43ee3d4168c3f0291e7ab9e9c3fa10
Author: Campbell Barton
Date:   Wed Aug 5 20:26:52 2015 +1000
Branches: master
https://developer.blender.org/rB7853cb3c5a43ee3d4168c3f0291e7ab9e9c3fa10

Remove redundant addition in BKE_mesh_calc_volume

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

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

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

diff --git a/source/blender/blenkernel/intern/mesh_evaluate.c b/source/blender/blenkernel/intern/mesh_evaluate.c
index a334951..3bc0492 100644
--- a/source/blender/blenkernel/intern/mesh_evaluate.c
+++ b/source/blender/blenkernel/intern/mesh_evaluate.c
@@ -2121,8 +2121,7 @@ void BKE_mesh_calc_volume(
 			totvol += vol;
 		}
 		if (r_center) {
-			/* averaging factor 1/4 is applied in the end */
-			madd_v3_v3fl(r_center, center, vol);  /* XXX could extract this */
+			/* averaging factor 1/3 is applied in the end */
 			madd_v3_v3fl(r_center, v1->co, vol);
 			madd_v3_v3fl(r_center, v2->co, vol);
 			madd_v3_v3fl(r_center, v3->co, vol);
@@ -2137,11 +2136,11 @@ void BKE_mesh_calc_volume(
 		*r_volume = fabsf(totvol);
 	}
 	if (r_center) {
-		/* Note: Factor 1/4 is applied once for all vertices here.
+		/* Note: Factor 1/3 is applied once for all vertices here.
 		 * This also automatically negates the vector if totvol is negative.
 		 */
 		if (totvol != 0.0f)
-			mul_v3_fl(r_center, 0.25f / totvol);
+			mul_v3_fl(r_center, (1.0f / 3.0f) / totvol);
 	}
 }




More information about the Bf-blender-cvs mailing list