blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Fix T78042: GPencil: Strokes go missing after Interpolation from another layer 

This was due some strokes could be tagged and as the layer was locked, the strokes were not untagged and removed when all tagged strokes are removed.

The tagged strokes are used as temp ghost of the interpolation and removed at the end of the interpolation.
This commit is contained in:
Antonio Vazquez 2020-06-19 19:39:21 +02:00 committed by Jeroen Bakker
parent 061869fe61
commit 2a78504d0c
Notes: blender-bot 2023-02-14 06:25:25 +01:00 
Referenced by issue #78042, GPencil: Strokes go missing after Interpolation from another layer
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/editors/gpencil/gpencil_interpolate.c
View File

@ -138,7 +138,9 @@ static void gp_interpolate_free_temp_strokes(bGPDframe *gpf)
/* Helper: Untag all strokes. */
static void gp_interpolate_untag_strokes(bGPDframe *gpf)
{
BLI_assert(gpf != NULL);
if (gpf == NULL) {
return;
}
LISTBASE_FOREACH (bGPDstroke *, gps, &gpf->strokes) {
if (gps->flag & GP_STROKE_TAG) {
@ -262,6 +264,12 @@ static void gp_interpolate_set_points(bContext *C, tGPDinterpolate *tgpi)
LISTBASE_FOREACH (bGPDlayer *, gpl, &gpd->layers) {
tGPDinterpolate_layer *tgpil;
/* Untag strokes to be sure nothing is pending. This must be done for
* all layer because it could be anything tagged and it would be removed
* at the end of the process when all tagged strokes are removed. */
gp_interpolate_untag_strokes(gpl->actframe);
gp_interpolate_untag_strokes(gpl->actframe->next);
/* all layers or only active */
if (!(tgpi->flag & GP_TOOLFLAG_INTERPOLATE_ALL_LAYERS) && (gpl != active_gpl)) {
continue;
@ -278,10 +286,6 @@ static void gp_interpolate_set_points(bContext *C, tGPDinterpolate *tgpi)
tgpil->prevFrame = gpl->actframe;
tgpil->nextFrame = gpl->actframe->next;
/* Untag interpolated strokes to be sure nothing is pending. */
gp_interpolate_untag_strokes(tgpil->prevFrame);
gp_interpolate_untag_strokes(tgpil->nextFrame);
BLI_addtail(&tgpi->ilayers, tgpil);
/* create a new temporary frame */