[Bf-blender-cvs] [7c7db3c083c] asset-lite-greasepencil: Fix error after merge master

Antonio Vazquez noreply at git.blender.org
Fri Jul 29 10:44:13 CEST 2022


Commit: 7c7db3c083c953c43f86db904b7c9008ee9da831
Author: Antonio Vazquez
Date:   Fri Jul 29 10:43:43 2022 +0200
Branches: asset-lite-greasepencil
https://developer.blender.org/rB7c7db3c083c953c43f86db904b7c9008ee9da831

Fix error after merge master

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

M	source/blender/editors/render/render_preview.cc

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

diff --git a/source/blender/editors/render/render_preview.cc b/source/blender/editors/render/render_preview.cc
index 155da2ed41e..8eb46240a27 100644
--- a/source/blender/editors/render/render_preview.cc
+++ b/source/blender/editors/render/render_preview.cc
@@ -1045,7 +1045,7 @@ static Scene *gpencil_preview_scene_create(const struct ObjectPreviewData *previ
   Scene *scene = BKE_scene_add(preview_data->pr_main, "Object preview scene");
   /* Grease pencil needs to set the scene to the current frame or the strokes
    * will not be visible in the preview.  */
-  CFRA = preview_data->cfra;
+  scene->r.cfra = preview_data->cfra;
   ViewLayer *view_layer = (ViewLayer *)scene->view_layers.first;
   Depsgraph *depsgraph = DEG_graph_new(
       preview_data->pr_main, scene, view_layer, DAG_EVAL_VIEWPORT);



More information about the Bf-blender-cvs mailing list