[Bf-blender-cvs] [0796891] master: Bake-API: silencing warnings (and fixing a potential memory-access crash)

Dalai Felinto noreply at git.blender.org
Thu Aug 28 12:15:04 CEST 2014


Commit: 079689107ad0a3c637166cf92afe30ab85c8af49
Author: Dalai Felinto
Date:   Thu Aug 28 12:14:14 2014 +0200
Branches: master
https://developer.blender.org/rB079689107ad0a3c637166cf92afe30ab85c8af49

Bake-API: silencing warnings (and fixing a potential memory-access crash)

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

M	source/blender/editors/object/object_bake_api.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 5853bb0..fd4db4f 100644
--- a/source/blender/editors/object/object_bake_api.c
+++ b/source/blender/editors/object/object_bake_api.c
@@ -561,7 +561,7 @@ static int bake(
 	int tot_highpoly;
 
 	char restrict_flag_low = ob_low->restrictflag;
-	char restrict_flag_cage;
+	char restrict_flag_cage = 0;
 
 	Mesh *me_low = NULL;
 	Mesh *me_cage = NULL;
diff --git a/source/blender/render/intern/source/bake_api.c b/source/blender/render/intern/source/bake_api.c
index 08fea63..6f41175 100644
--- a/source/blender/render/intern/source/bake_api.c
+++ b/source/blender/render/intern/source/bake_api.c
@@ -356,7 +356,7 @@ static void mesh_calc_tri_tessface(
 	MFace *mface;
 	MVert *mvert;
 	TSpace *tspace;
-	float *precomputed_normals;
+	float *precomputed_normals = NULL;
 	bool calculate_normal;
 
 	mface = CustomData_get_layer(&me->fdata, CD_MFACE);
@@ -379,7 +379,7 @@ static void mesh_calc_tri_tessface(
 	p_id = -1;
 	for (i = 0; i < me->totface; i++) {
 		MFace *mf = &mface[i];
-		TSpace *ts = &tspace[i * 4];
+		TSpace *ts = tangent ? &tspace[i * 4] : NULL;
 
 		p_id++;




More information about the Bf-blender-cvs mailing list