[Bf-blender-cvs] [b3e2c36c87e] greasepencil-object: Fix error in rotation

Antonio Vazquez noreply at git.blender.org
Sun Jan 28 11:20:52 CET 2018


Commit: b3e2c36c87e3a23a88cd4a78cbc537ef0d31ddb3
Author: Antonio Vazquez
Date:   Sun Jan 28 11:20:33 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rBb3e2c36c87e3a23a88cd4a78cbc537ef0d31ddb3

Fix error in rotation

When rotate using falloff the stroke was scaled because the scale factors was changed by falloff.

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

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

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

diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 53346e1728e..dc0de638201 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -3805,9 +3805,15 @@ static void ElementRotation_ex(TransInfo *t, TransData *td, float mat[3][3], con
 		/* apply gpencil falloff */
 		if (t->options & CTX_GPENCIL_STROKES) {
 			bGPDstroke *gps = (bGPDstroke *)td->extra;
+			float sx = smat[0][0];
+			float sy = smat[1][1];
+			float sz = smat[2][2];
+
 			mul_m3_fl(smat, gps->falloff);
 			/* fix scale */
-			smat[0][0] = smat[1][1] = smat[2][2] = 1.0f;
+			smat[0][0] = sx;
+			smat[1][1] = sy;
+			smat[2][2] = sz;
 		}
 
 		sub_v3_v3v3(vec, td->iloc, center);



More information about the Bf-blender-cvs mailing list