[Bf-blender-cvs] [efec93974e3] greasepencil-object: GP: Use multiframe falloff for Bend transformation
Antonioya
noreply at git.blender.org
Wed Jan 16 11:25:23 CET 2019
Commit: efec93974e3b2662f0a2c034c5b07326d037f4d1
Author: Antonioya
Date: Wed Jan 16 11:25:12 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rBefec93974e3b2662f0a2c034c5b07326d037f4d1
GP: Use multiframe falloff for Bend transformation
===================================================================
M source/blender/editors/transform/transform.c
===================================================================
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 10082eaa6ef..652316ffc02 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -3322,7 +3322,20 @@ static void Bend(TransInfo *t, const int UNUSED(mval[2]))
CLAMP(fac, 0.0f, 1.0f);
}
- fac_scaled = fac * td->factor;
+ if (t->options & CTX_GPENCIL_STROKES) {
+ /* grease pencil multiframe falloff */
+ bGPDstroke *gps = (bGPDstroke *)td->extra;
+ if (gps != NULL) {
+ fac_scaled = fac * td->factor * gps->runtime.multi_frame_falloff;
+ }
+ else {
+ fac_scaled = fac * td->factor;
+ }
+ }
+ else {
+ fac_scaled = fac * td->factor;
+ }
+
axis_angle_normalized_to_mat3(mat, data->warp_nor, values.angle * fac_scaled);
interp_v3_v3v3(delta, warp_sta_local, warp_end_radius_local, fac_scaled);
sub_v3_v3(delta, warp_sta_local);
More information about the Bf-blender-cvs
mailing list