[Bf-blender-cvs] [e94c38e0051] master: Merge branch 'blender-v2.92-release'

[Antonio Vazquez]

Commit: e94c38e005103ced62c4b0b8033a0df8ca932c8d
Author: Antonio Vazquez
Date:   Mon Feb 1 11:01:29 2021 +0100
Branches: master
https://developer.blender.org/rBe94c38e005103ced62c4b0b8033a0df8ca932c8d

Merge branch 'blender-v2.92-release'

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



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

diff --cc source/blender/draw/engines/gpencil/gpencil_engine.c
index cecaefa0ca8,153dcfb6ea7..6627d38366f
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@@ -619,16 -617,15 +619,24 @@@ void GPENCIL_cache_populate(void *ved, 
      /* Special case for rendering onion skin. */
      bGPdata *gpd = (bGPdata *)ob->data;
      bool do_onion = (!pd->is_render) ? pd->do_onion : (gpd->onion_flag & GP_ONION_GHOST_ALWAYS);
 +    gpd->runtime.playing = (short)pd->playing;
 +
 +    /* When render in background the active frame could not be properly set due thread priority
 +     * better set again. This is not required in viewport. */
 +    if (txl->render_depth_tx) {
 +      LISTBASE_FOREACH (bGPDlayer *, gpl, &gpd->layers) {
 +        gpl->actframe = BKE_gpencil_layer_frame_get(gpl, pd->cfra, GP_GETFRAME_USE_PREV);
 +      }
 +    }
  
+     /* When render in background the active frame could not be properly set due thread priority
+      * better set again. This is not required in viewport. */
+     if (txl->render_depth_tx) {
+       LISTBASE_FOREACH (bGPDlayer *, gpl, &gpd->layers) {
+         gpl->actframe = BKE_gpencil_layer_frame_get(gpl, pd->cfra, GP_GETFRAME_USE_PREV);
+       }
+     }
+ 
      BKE_gpencil_visible_stroke_iter(is_final_render ? pd->view_layer : NULL,
                                      ob,
                                      gpencil_layer_cache_populate,