[Bf-blender-cvs] [0df76ecbf34] master: Cleanup: Remove code duplication (merge error)

[Falk David]

Commit: 0df76ecbf3468ba2f23f671009cbdea9fe83c928
Author: Falk David
Date:   Mon Feb 15 15:44:52 2021 +0100
Branches: master
https://developer.blender.org/rB0df76ecbf3468ba2f23f671009cbdea9fe83c928

Cleanup: Remove code duplication (merge error)

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

M	source/blender/draw/engines/gpencil/gpencil_engine.c

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

diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c
index e738b0d063c..e35b8bc2bbe 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@ -629,14 +629,6 @@ 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,