diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-05-16 06:01:26 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-05-16 06:01:26 +0300 |
| commit | 57660aac743a70eea0b917ae92dd5d6bdb1b12a9 (patch) | |
| tree | 59b23a0e8540e72c1d98fed5e5d75d7214482c2e /source/blender/editors/object/object_bake_api.c | |
| parent | 5a90542d3d4ba1a193975a3cb9c50eec1f6a8c8a (diff) | |
| parent | d508b69e44bb3c5911d7716048c28fe0dc5e609b (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/object/object_bake_api.c')
| -rw-r--r-- | source/blender/editors/object/object_bake_api.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/editors/object/object_bake_api.c b/source/blender/editors/object/object_bake_api.c index 58b14db7c01..5b204b385de 100644 --- a/source/blender/editors/object/object_bake_api.c +++ b/source/blender/editors/object/object_bake_api.c @@ -1176,6 +1176,9 @@ static int bake_exec(bContext *C, wmOperator *op) BakeAPIRender bkr = {NULL}; Scene *scene = CTX_data_scene(C); + G.is_break = false; + G.is_rendering = true; + bake_set_props(op, scene); bake_init_api_data(op, C, &bkr); @@ -1227,6 +1230,7 @@ static int bake_exec(bContext *C, wmOperator *op) finally: + G.is_rendering = false; BLI_freelistN(&bkr.selected_objects); return result; } |