[Bf-blender-cvs] [2b8e160] bake-cycles: Cycles-Bake: [review] building in Linux & cleanup (by Campbell Barton)

[Dalai Felinto]

Commit: 2b8e160568deade9488aa3aefd473ee67d3ccd56
Author: Dalai Felinto
Date:   Thu Mar 27 20:51:24 2014 -0300
https://developer.blender.org/rB2b8e160568deade9488aa3aefd473ee67d3ccd56

Cycles-Bake: [review] building in Linux & cleanup (by Campbell Barton)

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

M	source/blender/editors/object/object_bake_api.c
M	source/blender/makesrna/intern/rna_render.c
M	source/blender/render/intern/source/bake_api.c

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

diff --git a/source/blender/editors/object/object_bake_api.c b/source/blender/editors/object/object_bake_api.c
index debfe0d..96edfd4 100644
--- a/source/blender/editors/object/object_bake_api.c
+++ b/source/blender/editors/object/object_bake_api.c
@@ -25,7 +25,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/editors/object/object_bake.c
+/** \file blender/editors/object/object_bake_api.c
  *  \ingroup edobj
  */
 
diff --git a/source/blender/makesrna/intern/rna_render.c b/source/blender/makesrna/intern/rna_render.c
index fa5c979..3423118 100644
--- a/source/blender/makesrna/intern/rna_render.c
+++ b/source/blender/makesrna/intern/rna_render.c
@@ -151,8 +151,8 @@ static void engine_render(RenderEngine *engine, struct Scene *scene)
 	RNA_parameter_list_free(&list);
 }
 
-static void engine_bake(RenderEngine *engine, struct Scene *scene, struct Object *object, int pass_type,
-                        struct BakePixel *pixel_array, int num_pixels, int depth, void *result)
+static void engine_bake(RenderEngine *engine, struct Scene *scene, struct Object *object, const int pass_type,
+                        const struct BakePixel *pixel_array, const int num_pixels, const int depth, void *result)
 {
 	extern FunctionRNA rna_RenderEngine_bake_func;
 	PointerRNA ptr;
diff --git a/source/blender/render/intern/source/bake_api.c b/source/blender/render/intern/source/bake_api.c
index 46436dd..f84d672 100644
--- a/source/blender/render/intern/source/bake_api.c
+++ b/source/blender/render/intern/source/bake_api.c
@@ -15,13 +15,12 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * Contributors: 2004/2005/2006 Blender Foundation, full recode
- * Contributors: Vertex color baking, Copyright 2011 AutoCRC
+ * Contributors:
  *
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/render/intern/source/bake.c
+/** \file blender/render/intern/source/bake_api.c
  *  \ingroup render
  */
 
@@ -360,12 +359,7 @@ void RE_populate_bake_pixels_from_object(Mesh *me_low, Mesh *me_high,
 	bvhtree_from_mesh_faces(&treeData, dm_high, 0.0, 2, 6);
 	if (treeData.tree == NULL) {
 		printf("Baking: Out of memory\n");
-
-		dm_high->release(dm_high);
-
-		MEM_freeN(tris_low);
-		MEM_freeN(tris_high);
-		return;
+		goto cleanup;
 	}
 
 	for (i=0; i < num_pixels; i++) {
@@ -393,6 +387,7 @@ void RE_populate_bake_pixels_from_object(Mesh *me_low, Mesh *me_high,
 	}
 
 	/* garbage collection */
+cleanup:
 	free_bvhtree_from_mesh(&treeData);
 
 	dm_high->release(dm_high);
@@ -485,7 +480,7 @@ static void normal_uncompress(float out[3], const float in[3])
 
 static void normal_compress(float out[3], const float in[3], const int normal_swizzle[3])
 {
-	static const int swizzle_index[6] =
+	const int swizzle_index[6] =
 	{
 		0, // OB_POSX
 		1, // OB_POSY
@@ -494,7 +489,7 @@ static void normal_compress(float out[3], const float in[3], const int normal_sw
 		1, // OB_NEGY
 		2, // OB_NEGZ
 	};
-	static const float swizzle_sign[6] =
+	const float swizzle_sign[6] =
 	{
 		 1.0f, // OB_POSX
 		 1.0f, // OB_POSY