Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonioya <blendergit@gmail.com>2019-01-16 13:25:12 +0300
committerAntonioya <blendergit@gmail.com>2019-01-16 21:22:13 +0300
commit798e67bc9e9d569c1781f4b8d41b4a752cbb8234 (patch)
tree717e67f59884e6d58acdf7ee611c0a6575584cc5 /source/blender/editors/transform
parentc2dee803e31446c42dc6a371b9e89c4f4d559ead (diff)
GP: Use multiframe falloff for Bend transformation
Diffstat (limited to 'source/blender/editors/transform')
-rw-r--r--source/blender/editors/transform/transform.c15
1 files changed, 14 insertions, 1 deletions
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);