Commit: cae97cde9cedcbb429212efbe4b37dd8df1e7f78
Author: Julian Eisel
Date: Thu Sep 10 19:56:11 2020 +0200
Branches: asset-metadata
https://developer.blender.org/rBcae97cde9cedcbb429212efbe4b37dd8df1e7f78
Fix compile error after last merge
===================================================================
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 8a29a08369d..561ebf7671b 100644
--- a/source/blender/editors/render/render_preview.c
+++ b/source/blender/editors/render/render_preview.c
@@ -710,14 +710,10 @@ struct ObjectPreviewData {
int sizey;
};
-static Object *object_preview_camera_create(Main *preview_main,
- Scene *scene,
- ViewLayer *view_layer,
- Object *preview_object,
- int sizex,
- int sizey)
+static Object *object_preview_camera_create(
+ Main *preview_main, ViewLayer *view_layer, Object *preview_object, int
sizex, int sizey)
{
- Object *camera = BKE_object_add(preview_main, scene, view_layer, OB_CAMERA,
"Preview Camera");
+ Object *camera = BKE_object_add(preview_main, view_layer, OB_CAMERA,
"Preview Camera");
float rotmat[3][3];
float dummyscale[3];
@@ -757,7 +753,6 @@ static Scene *object_preview_scene_create(const struct
ObjectPreviewData *previe
BKE_collection_object_add(preview_data->main, scene->master_collection,
preview_object_copy);
Object *camera_object = object_preview_camera_create(preview_data->main,
- scene,
view_layer,
preview_object_copy,
preview_data->sizex,
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
