[Bf-blender-cvs] [f6c1106] master: Fix uninitialized var use initializing bake data
Campbell Barton
noreply at git.blender.org
Sun Feb 21 06:28:37 CET 2016
Commit: f6c11062bc500df2b7d9ed9e83283ef5648716cb
Author: Campbell Barton
Date: Sun Feb 21 16:19:10 2016 +1100
Branches: master
https://developer.blender.org/rBf6c11062bc500df2b7d9ed9e83283ef5648716cb
Fix uninitialized var use initializing bake data
===================================================================
M source/blender/render/intern/source/bake_api.c
===================================================================
diff --git a/source/blender/render/intern/source/bake_api.c b/source/blender/render/intern/source/bake_api.c
index 63aa0d5..69fd1e0 100644
--- a/source/blender/render/intern/source/bake_api.c
+++ b/source/blender/render/intern/source/bake_api.c
@@ -399,8 +399,6 @@ static TriTessFace *mesh_calc_tri_tessface(
int i;
MVert *mvert;
TSpace *tspace;
- float *precomputed_normals = NULL;
- bool calculate_normal;
const int tottri = poly_to_tri_count(me->totpoly, me->totloop);
MLoopTri *looptri;
@@ -422,9 +420,6 @@ static TriTessFace *mesh_calc_tri_tessface(
DM_ensure_normals(dm);
DM_calc_loop_tangents(dm);
- precomputed_normals = dm->getPolyDataArray(dm, CD_NORMAL);
- calculate_normal = precomputed_normals ? false : true;
-
tspace = dm->getLoopDataArray(dm, CD_TANGENT);
BLI_assert(tspace);
}
@@ -435,6 +430,10 @@ static TriTessFace *mesh_calc_tri_tessface(
me->totloop, me->totpoly,
looptri);
+
+ const float *precomputed_normals = dm->getPolyDataArray(dm, CD_NORMAL);
+ const bool calculate_normal = precomputed_normals ? false : true;
+
for (i = 0; i < tottri; i++) {
const MLoopTri *lt = &looptri[i];
const MPoly *mp = &me->mpoly[lt->poly];
More information about the Bf-blender-cvs
mailing list