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:
authorJoshua Leung <aligorith@gmail.com>2017-09-02 18:38:44 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2017-09-04 14:02:53 +0300
commited0429e7e685a15cd63ea336fb78189579ca29b5 (patch)
tree32b4e54d32cf344b8d1ccf5719805cb471626dbf
parent27c42e05c41f072bf401d7d81cce9dcb599904af (diff)
Fix: GPencil Sequence Interpolation for thickness/strength was inverted
For example, if you have two keyframes: k1 = 1px, k2 = 10px it was doing: 1px, 9px, 8px, ..., 3px, 2px, 10px instead of: 1px, 2px, 3px, ..., 8px, 9px, 10px
-rw-r--r--source/blender/editors/gpencil/gpencil_interpolate.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/gpencil/gpencil_interpolate.c b/source/blender/editors/gpencil/gpencil_interpolate.c
index 4bcc9f7b811..83e2a85db49 100644
--- a/source/blender/editors/gpencil/gpencil_interpolate.c
+++ b/source/blender/editors/gpencil/gpencil_interpolate.c
@@ -117,8 +117,8 @@ static void gp_interpolate_update_points(bGPDstroke *gps_from, bGPDstroke *gps_t
/* Interpolate all values */
interp_v3_v3v3(&pt->x, &prev->x, &next->x, factor);
- pt->pressure = interpf(prev->pressure, next->pressure, factor);
- pt->strength = interpf(prev->strength, next->strength, factor);
+ pt->pressure = interpf(prev->pressure, next->pressure, 1.0f - factor);
+ pt->strength = interpf(prev->strength, next->strength, 1.0f - factor);
CLAMP(pt->strength, GPENCIL_STRENGTH_MIN, 1.0f);
}
}