diff options
author | Antonio Vazquez <blendergit@gmail.com> | 2020-10-22 21:02:09 +0300 |
---|---|---|
committer | Antonio Vazquez <blendergit@gmail.com> | 2020-10-22 21:02:09 +0300 |
commit | d453bbbd26d98a816bd52da502132a52cc6825c8 (patch) | |
tree | a84ee1e52a55accadefdb4608a64c732b22f3b7d | |
parent | 3953833b60d73a1560f5ec70fd449113da4b83c9 (diff) | |
parent | 8432452f6fcb5f96df900250700f7fed7dfa32b5 (diff) |
Merge branch 'blender-v2.91-release'
-rw-r--r-- | source/blender/blenkernel/intern/gpencil.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c index 31cd812f8df..6c6ca996caa 100644 --- a/source/blender/blenkernel/intern/gpencil.c +++ b/source/blender/blenkernel/intern/gpencil.c @@ -2549,17 +2549,17 @@ void BKE_gpencil_visible_stroke_iter(ViewLayer *view_layer, /* Use evaluated frame (with modifiers for active stroke)/ */ act_gpf = gpl->actframe; if (act_gpf) { + act_gpf->runtime.onion_id = 0; + if (layer_cb) { + layer_cb(gpl, act_gpf, NULL, thunk); + } + /* If layer solo mode and Paint mode, only keyframes with data are displayed. */ if (GPENCIL_PAINT_MODE(gpd) && (gpl->flag & GP_LAYER_SOLO_MODE) && (act_gpf->framenum != cfra)) { continue; } - act_gpf->runtime.onion_id = 0; - if (layer_cb) { - layer_cb(gpl, act_gpf, NULL, thunk); - } - LISTBASE_FOREACH (bGPDstroke *, gps, &act_gpf->strokes) { if (gps->totpoints == 0) { continue; |