[Bf-blender-cvs] [1be465cccbf] master: GPencil: Fix potential error in interpolate frame

Antonio Vazquez noreply at git.blender.org
Fri Dec 18 15:57:24 CET 2020


Commit: 1be465cccbf96c64e5a90962bd2c76cbc7675fb0
Author: Antonio Vazquez
Date:   Fri Dec 18 15:57:10 2020 +0100
Branches: master
https://developer.blender.org/rB1be465cccbf96c64e5a90962bd2c76cbc7675fb0

GPencil: Fix potential error in interpolate frame

As now it is using a duplicated frame, the untag must be done before copying the frames.

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

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 9bca294cf30..1c967110198 100644
--- a/source/blender/editors/gpencil/gpencil_interpolate.c
+++ b/source/blender/editors/gpencil/gpencil_interpolate.c
@@ -483,14 +483,15 @@ static bool gpencil_interpolate_set_init_values(bContext *C, wmOperator *op, tGP
 
   /* set interpolation weight */
   tgpi->shift = RNA_float_get(op->ptr, "shift");
-  /* set layers */
-  gpencil_interpolate_set_points(C, tgpi);
 
   /* Untag strokes to be sure nothing is pending due any canceled process. */
   LISTBASE_FOREACH (bGPDlayer *, gpl, &tgpi->gpd->layers) {
     gpencil_interpolate_untag_strokes(gpl);
   }
 
+  /* Set layers */
+  gpencil_interpolate_set_points(C, tgpi);
+
   return 1;
 }



More information about the Bf-blender-cvs mailing list