[Bf-blender-cvs] [8430908a987] asset-greasepencil: GPencil: Use ID directly as parm

Antonio Vazquez noreply at git.blender.org
Fri Jul 9 18:21:42 CEST 2021


Commit: 8430908a987e5b68bb922fc45a6556ffbd4ad8cc
Author: Antonio Vazquez
Date:   Fri Jul 9 18:21:35 2021 +0200
Branches: asset-greasepencil
https://developer.blender.org/rB8430908a987e5b68bb922fc45a6556ffbd4ad8cc

GPencil: Use ID directly as parm

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

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

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

diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c
index 36ed79dc1da..138d712184c 100644
--- a/source/blender/editors/render/render_preview.c
+++ b/source/blender/editors/render/render_preview.c
@@ -880,9 +880,12 @@ static Scene *gpencil_preview_scene_create(const struct ObjectPreviewData *previ
       preview_data->pr_main, scene, view_layer, DAG_EVAL_VIEWPORT);
 
   /* Grease pencil draw engine needs an object to draw the datablock. */
-  bGPdata *gpd = (bGPdata *)preview_data->datablock;
-  Object *ob_temp = BKE_object_add_for_data(
-      preview_data->pr_main, view_layer, OB_GPENCIL, "preview_object", &gpd->id, false);
+  Object *ob_temp = BKE_object_add_for_data(preview_data->pr_main,
+                                            view_layer,
+                                            OB_GPENCIL,
+                                            "preview_object",
+                                            preview_data->datablock,
+                                            false);
 
   BLI_assert(ob_temp != NULL);
   BLI_addtail(&preview_data->pr_main->objects, ob_temp);



More information about the Bf-blender-cvs mailing list