diff options
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/interface/interface_icons.c | 2 | ||||
-rw-r--r-- | source/blender/editors/object/object_bake.c | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index 2fca0bbbf79..9815d58764c 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -1064,7 +1064,7 @@ static struct { int calls; /* Number of calls batched together */ bool enabled; float mat[4][4]; -} g_icon_draw_cache = {0}; +} g_icon_draw_cache = {{{{0}}}}; void UI_icon_draw_cache_begin(void) { 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); |