[Bf-blender-cvs] [e511710] master: Fix potential memory leak baking

[Campbell Barton]

Commit: e5117108aae8ae9a380b27b6402d2419ea8cebc7
Author: Campbell Barton
Date:   Thu Oct 1 17:19:12 2015 +1000
Branches: master
https://developer.blender.org/rBe5117108aae8ae9a380b27b6402d2419ea8cebc7

Fix potential memory leak baking

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

M	release/datafiles/locale
M	release/scripts/addons
M	release/scripts/addons_contrib
M	source/blender/render/intern/source/bake_api.c

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

diff --git a/release/datafiles/locale b/release/datafiles/locale
index c651e63..4e14605 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit c651e63a9a537624f639950f3127a1dee29205d0
+Subproject commit 4e1460519fb76d8fe4b838334d139a3e8d446827
diff --git a/release/scripts/addons b/release/scripts/addons
index 0eef469..cd26c93 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 0eef469a5d444f396152376a49d7faad0ba51aba
+Subproject commit cd26c938e597d7493f3d88dfdf69346c0f8b50ee
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index cf842d8..34dc9b5 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit cf842d8bb7b0033ca4fa99f7ebedcbd3810fd274
+Subproject commit 34dc9b5a6a5917db65ac589c40fe1b5fed3605d1
diff --git a/source/blender/render/intern/source/bake_api.c b/source/blender/render/intern/source/bake_api.c
index 87cdd87..77f6ab9 100644
--- a/source/blender/render/intern/source/bake_api.c
+++ b/source/blender/render/intern/source/bake_api.c
@@ -591,6 +591,18 @@ void RE_bake_pixels_populate(
 	if (me->edit_btmesh)
 		return;
 
+	if ((uv_layer == NULL) || (uv_layer[0] == '\0')) {
+		mloopuv = CustomData_get_layer(&me->ldata, CD_MLOOPUV);
+	}
+	else {
+		int uv_id = CustomData_get_named_layer(&me->ldata, CD_MLOOPUV, uv_layer);
+		mloopuv = CustomData_get_layer_n(&me->ldata, CD_MTFACE, uv_id);
+	}
+
+	if (mloopuv == NULL)
+		return;
+
+
 	bd.pixel_array = pixel_array;
 	bd.zspan = MEM_callocN(sizeof(ZSpan) * bake_images->size, "bake zspan");
 
@@ -603,17 +615,6 @@ void RE_bake_pixels_populate(
 		zbuf_alloc_span(&bd.zspan[i], bake_images->data[i].width, bake_images->data[i].height, R.clipcrop);
 	}
 
-	if ((uv_layer == NULL) || (uv_layer[0] == '\0')) {
-		mloopuv = CustomData_get_layer(&me->ldata, CD_MLOOPUV);
-	}
-	else {
-		int uv_id = CustomData_get_named_layer(&me->ldata, CD_MLOOPUV, uv_layer);
-		mloopuv = CustomData_get_layer_n(&me->ldata, CD_MTFACE, uv_id);
-	}
-
-	if (mloopuv == NULL)
-		return;
-
 	looptri = MEM_mallocN(sizeof(*looptri) * tottri, __func__);
 
 	BKE_mesh_recalc_looptri(