[Bf-blender-cvs] [c6719730921] master: Fix: GPencil Sequence Interpolation for thickness/strength was inverted

Joshua Leung noreply at git.blender.org
Sun Sep 3 02:51:07 CEST 2017


Commit: c6719730921f16bcf7758f425540b1e12e46734a
Author: Joshua Leung
Date:   Sun Sep 3 03:38:44 2017 +1200
Branches: master
https://developer.blender.org/rBc6719730921f16bcf7758f425540b1e12e46734a

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

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

M	source/blender/editors/gpencil/gpencil_interpolate.c

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

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);
 	}
 }



More information about the Bf-blender-cvs mailing list