[Bf-blender-cvs] [67ffa4376cd] asset-lite-greasepencil: Fix merge errors due change in parameter list

[Antonio Vazquez]

Commit: 67ffa4376cdd16a1f801e86c1385a2f0b0d141a5
Author: Antonio Vazquez
Date:   Fri Sep 30 19:35:10 2022 +0200
Branches: asset-lite-greasepencil
https://developer.blender.org/rB67ffa4376cdd16a1f801e86c1385a2f0b0d141a5

Fix merge errors due change in parameter list

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

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 dc36638c8c3..216aff55ffd 100644
--- a/source/blender/editors/render/render_preview.cc
+++ b/source/blender/editors/render/render_preview.cc
@@ -1056,6 +1056,7 @@ static Scene *gpencil_preview_scene_create(const struct ObjectPreviewData *previ
 
   /* Grease pencil draw engine needs an object to draw the datablock. */
   Object *ob_temp = BKE_object_add_for_data(preview_data->pr_main,
+                                            scene,
                                             view_layer,
                                             OB_GPENCIL,
                                             "preview_object",
@@ -1068,7 +1069,7 @@ static Scene *gpencil_preview_scene_create(const struct ObjectPreviewData *previ
     BKE_object_materials_test(preview_data->pr_main, ob_temp, preview_data->datablock);
   }
 
-  Object *camera_object = object_preview_camera_create(preview_data->pr_main, view_layer, ob_temp);
+  Object *camera_object = object_preview_camera_create(preview_data->pr_main, scene, view_layer, ob_temp);
 
   scene->camera = camera_object;
   scene->r.xsch = preview_data->sizex;