diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-12-28 07:26:34 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-12-28 08:00:08 +0300 |
| commit | 870941c87a484b41294d5255c1807e0e87138458 (patch) | |
| tree | 35337d9a49c597098963a42cd2d844c71cae00e2 /source | |
| parent | cadcb12292c54cb7aeb2aaf91e7ea3bad87e9616 (diff) | |
Fix leak in cycles-bake
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/object/object_bake_api.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/editors/object/object_bake_api.c b/source/blender/editors/object/object_bake_api.c index 57fabcb06cf..83eeedfef52 100644 --- a/source/blender/editors/object/object_bake_api.c +++ b/source/blender/editors/object/object_bake_api.c @@ -1081,8 +1081,9 @@ static int bake_exec(bContext *C, wmOperator *op) /* setup new render */ RE_test_break_cb(re, NULL, bake_break); - if (!bake_objects_check(bkr.main, bkr.ob, &bkr.selected_objects, bkr.reports, bkr.is_selected_to_active)) - return OPERATOR_CANCELLED; + if (!bake_objects_check(bkr.main, bkr.ob, &bkr.selected_objects, bkr.reports, bkr.is_selected_to_active)) { + goto finally; + } if (bkr.is_clear) { const bool is_tangent = ((bkr.pass_type == SCE_PASS_NORMAL) && (bkr.normal_space == R_BAKE_SPACE_TANGENT)); @@ -1117,6 +1118,8 @@ static int bake_exec(bContext *C, wmOperator *op) RE_SetReports(re, NULL); + +finally: BLI_freelistN(&bkr.selected_objects); return result; } |