Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2018-04-28 17:20:19 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-04-28 17:28:19 +0300
commit54aa834b7d7cd60544e5e56c962f64bd48a3c400 (patch)
tree9e13d92e145e365e1a6a077cedb73da73c6cdacc /source/blender/editors/object/object_bake.c
parentbf75b248180e5f7411fa27cdc89d7d1f07f7735c (diff)
Cleanup: fix compiler warnings on macOS / clang.
Diffstat (limited to 'source/blender/editors/object/object_bake.c')
-rw-r--r--source/blender/editors/object/object_bake.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_bake.c b/source/blender/editors/object/object_bake.c
index b10b35618fb..a8da5c038b4 100644
--- a/source/blender/editors/object/object_bake.c
+++ b/source/blender/editors/object/object_bake.c
@@ -616,7 +616,11 @@ static int bake_image_exec(bContext *C, wmOperator *op)
Scene *scene = CTX_data_scene(C);
int result = OPERATOR_CANCELLED;
- BLI_assert(is_multires_bake(scene));
+ if (!is_multires_bake(scene)) {
+ BLI_assert(0);
+ return result;
+ }
+
result = multiresbake_image_exec_locked(C, op);
WM_event_add_notifier(C, NC_SCENE | ND_RENDER_RESULT, scene);