[Bf-blender-cvs] [0a1deaf] blender-v2.73-release: Fix leak in cycles-bake

Campbell Barton noreply at git.blender.org
Tue Jan 6 10:44:49 CET 2015


Commit: 0a1deaf89cbb7e757f5f19a5cda0b044c7c8fc67
Author: Campbell Barton
Date:   Sun Dec 28 15:26:34 2014 +1100
Branches: blender-v2.73-release
https://developer.blender.org/rB0a1deaf89cbb7e757f5f19a5cda0b044c7c8fc67

Fix leak in cycles-bake

===================================================================

M	source/blender/editors/object/object_bake_api.c

===================================================================

diff --git a/source/blender/editors/object/object_bake_api.c b/source/blender/editors/object/object_bake_api.c
index 57fabcb..83eeedf 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;
 }




More information about the Bf-blender-cvs mailing list