diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2014-08-28 14:14:14 +0400 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2014-08-28 14:14:24 +0400 |
| commit | 079689107ad0a3c637166cf92afe30ab85c8af49 (patch) | |
| tree | 1e3d8d61d5c41f7c912693a1585b29849ef0f0b4 | |
| parent | 3a200d66ae8c8b89aad83009bf6edcc6c1a92263 (diff) | |
Bake-API: silencing warnings (and fixing a potential memory-access crash)
| -rw-r--r-- | source/blender/editors/object/object_bake_api.c | 2 | ||||
| -rw-r--r-- | source/blender/render/intern/source/bake_api.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/object/object_bake_api.c b/source/blender/editors/object/object_bake_api.c index 5853bb04182..fd4db4f54af 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 08fea632cd4..6f41175620d 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++; |