Commit: a03e7ae90a004edea5db5dbd182c79557db36df8
Author: Julian Eisel
Date: Wed Oct 7 19:17:06 2020 +0200
Branches: asset-metadata
https://developer.blender.org/rBa03e7ae90a004edea5db5dbd182c79557db36df8
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 1b8c8f0c276..a1c4736b1f5 100644
--- a/source/blender/editors/render/render_preview.c
+++ b/source/blender/editors/render/render_preview.c
@@ -750,8 +750,9 @@ static Scene *object_preview_scene_create(const struct
ObjectPreviewData *previe
/* FIXME For now just create a copy of the object for the new main, until we
have a better way to
* obtain the ID in a different Main (i.e. read from asset file). */
- Object *preview_object_copy;
- if (!BKE_id_copy(preview_data->main, &preview_data->object->id, (ID
**)&preview_object_copy)) {
+ Object *preview_object_copy = (Object *)BKE_id_copy(preview_data->main,
+
&preview_data->object->id);
+ if (!preview_object_copy) {
BLI_assert(false);
return NULL;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
