Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2021-06-18 10:36:14 +0300
committerJeroen Bakker <jeroen@blender.org>2021-06-30 10:18:48 +0300
commit32658bb5c9fae862332ba3852cc4b3f586213016 (patch)
treef79164346fd4ea9649f7364ac0dc2e78b92bf2b9
parent174f39bd039350737cb84fb21b4dd2264c381a21 (diff)
Fix invalid polygon normal array access building bake data
Pre computed normals index wasn't properly aligned. Regression from 2ec00ea0c1be1ace7cd0c7b68e43cc8e87dd07c7.
-rw-r--r--source/blender/render/intern/bake.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/render/intern/bake.c b/source/blender/render/intern/bake.c
index 7af6d3e234f..416d85ce1a3 100644
--- a/source/blender/render/intern/bake.c
+++ b/source/blender/render/intern/bake.c
@@ -479,7 +479,7 @@ static TriTessFace *mesh_calc_tri_tessface(Mesh *me, bool tangent, Mesh *me_eval
loop_normals = CustomData_get_layer(&me_eval->ldata, CD_NORMAL);
}
- const float *precomputed_normals = CustomData_get_layer(&me->pdata, CD_NORMAL);
+ const float(*precomputed_normals)[3] = CustomData_get_layer(&me->pdata, CD_NORMAL);
const bool calculate_normal = precomputed_normals ? false : true;
for (i = 0; i < tottri; i++) {
@@ -511,7 +511,7 @@ static TriTessFace *mesh_calc_tri_tessface(Mesh *me, bool tangent, Mesh *me_eval
copy_v3_v3(triangles[i].normal, no);
}
else {
- copy_v3_v3(triangles[i].normal, &precomputed_normals[lt->poly]);
+ copy_v3_v3(triangles[i].normal, precomputed_normals[lt->poly]);
}
}