Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonio Vazquez <blendergit@gmail.com>2021-02-01 13:01:29 +0300
committerAntonio Vazquez <blendergit@gmail.com>2021-02-01 13:01:29 +0300
commite94c38e005103ced62c4b0b8033a0df8ca932c8d (patch)
tree89c31cc8160b6ed44cd57ad8420c0e7787623f31 /source/blender/draw/engines/gpencil/gpencil_engine.c
parent9c244820d1cb8d80ce1c7110a9f1580e3010e4e9 (diff)
parent54ac63f06b59517fca43860e465f4779432dc7a3 (diff)
Merge branch 'blender-v2.92-release'
Diffstat (limited to 'source/blender/draw/engines/gpencil/gpencil_engine.c')
-rw-r--r--source/blender/draw/engines/gpencil/gpencil_engine.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c
index cecaefa0ca8..6627d38366f 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@ -629,6 +629,14 @@ void GPENCIL_cache_populate(void *ved, Object *ob)
}
}
+ /* 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,