[Bf-blender-cvs] [e8e89c135f5] blender2.8: Transform: factor out matrix multiply w/ snapping

Andrew Hale noreply at git.blender.org
Wed Aug 22 01:40:55 CEST 2018


Commit: e8e89c135f56d05d04ae6db7e876725738539291
Author: Andrew Hale
Date:   Wed Aug 22 09:45:11 2018 +1000
Branches: blender2.8
https://developer.blender.org/rBe8e89c135f56d05d04ae6db7e876725738539291

Transform: factor out matrix multiply w/ snapping

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

M	source/blender/editors/transform/transform_snap.c

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

diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c
index 54253e36351..8188cb3f51c 100644
--- a/source/blender/editors/transform/transform_snap.c
+++ b/source/blender/editors/transform/transform_snap.c
@@ -1095,17 +1095,18 @@ static void TargetSnapMedian(TransInfo *t)
 		FOREACH_TRANS_DATA_CONTAINER (t, tc) {
 			TransData *td = tc->data;
 			int i;
+			float v[3];
+			zero_v3(v);
+
 			for (i = 0; i < tc->data_len && td->flag & TD_SELECTED; i++, td++) {
-				/* TODO(campbell): perform the global transformation once per TransDataContainer */
-				if (tc->use_local_mat) {
-					float v[3];
-					mul_v3_m4v3(v, tc->mat, td->center);
-					add_v3_v3(t->tsnap.snapTarget, v);
-				}
-				else {
-					add_v3_v3(t->tsnap.snapTarget, td->center);
-				}
+				add_v3_v3(v, td->center);
 			}
+
+			if (tc->use_local_mat) {
+				mul_m4_v3(tc->mat, v);
+			}
+
+			add_v3_v3(t->tsnap.snapTarget, v);
 			i_accum += i;
 		}



More information about the Bf-blender-cvs mailing list