[Bf-blender-cvs] [4ca6d8e9d8c] greasepencil-object: GP: Use multiframe falloff in Shear transform

Antonioya noreply at git.blender.org
Wed Jan 16 11:30:14 CET 2019


Commit: 4ca6d8e9d8c52cab496cbfcec5ca8a31c1d32263
Author: Antonioya
Date:   Wed Jan 16 11:30:06 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rB4ca6d8e9d8c52cab496cbfcec5ca8a31c1d32263

GP: Use multiframe falloff in Shear transform

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

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

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

diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 652316ffc02..7d488b91ca5 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -3534,7 +3534,19 @@ static void applyShear(TransInfo *t, const int UNUSED(mval[2]))
 			add_v3_v3(vec, center);
 			sub_v3_v3(vec, co);
 
-			mul_v3_fl(vec, td->factor);
+			if (t->options & CTX_GPENCIL_STROKES) {
+				/* grease pencil multiframe falloff */
+				bGPDstroke *gps = (bGPDstroke *)td->extra;
+				if (gps != NULL) {
+					mul_v3_fl(vec, td->factor * gps->runtime.multi_frame_falloff);
+				}
+				else {
+					mul_v3_fl(vec, td->factor);
+				}
+			}
+			else {
+				mul_v3_fl(vec, td->factor);
+			}
 
 			add_v3_v3v3(td->loc, td->iloc, vec);
 		}



More information about the Bf-blender-cvs mailing list