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 09:20:04 +0300
commitf6fb695ed8b08d28f4d0f1a71c1b60cf15929393 (patch)
tree035fa105f5c110fecbb31d87fae261e555087419
parentfb67495c7febc52f7069e18cc8c5c9ce711c6e10 (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/source/bake_api.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/render/intern/source/bake_api.c b/source/blender/render/intern/source/bake_api.c
index e823a481d59..6171277d150 100644
--- a/source/blender/render/intern/source/bake_api.c
+++ b/source/blender/render/intern/source/bake_api.c
@@ -471,7 +471,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++) {
@@ -503,7 +503,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]);
}
}