diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-11-30 17:54:46 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-11-30 18:28:56 +0300 |
| commit | ed5202ac6ad539d1c1734e8ea456245f42dc9bbf (patch) | |
| tree | cc418eef9aa80b903fa06c936f5f5bb604a16532 /source/blender/render | |
| parent | cedbaec46831824d19f33531308b1d743d417757 (diff) | |
Fix T58235: broken baking of tangent space normals.
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/bake_api.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/render/intern/source/bake_api.c b/source/blender/render/intern/source/bake_api.c index ca3907e8b73..181d3744ad7 100644 --- a/source/blender/render/intern/source/bake_api.c +++ b/source/blender/render/intern/source/bake_api.c @@ -432,8 +432,7 @@ static TriTessFace *mesh_calc_tri_tessface( me->totloop, me->totpoly, looptri); - - const float *precomputed_normals = me_eval ? CustomData_get_layer(&me_eval->pdata, CD_NORMAL) : NULL; + const float *precomputed_normals = me ? CustomData_get_layer(&me->pdata, CD_NORMAL) : NULL; const bool calculate_normal = precomputed_normals ? false : true; for (i = 0; i < tottri; i++) { @@ -514,11 +513,11 @@ bool RE_bake_pixels_populate_from_objects( tris_high[i] = mesh_calc_tri_tessface(highpoly[i].me, false, NULL); me_highpoly[i] = highpoly[i].me; - BKE_mesh_tessface_ensure(me_highpoly[i]); + BKE_mesh_runtime_looptri_ensure(me_highpoly[i]); - if (me_highpoly[i]->totface != 0) { + if (me_highpoly[i]->runtime.looptris.len != 0) { /* Create a bvh-tree for each highpoly object */ - BKE_bvhtree_from_mesh_get(&treeData[i], me_highpoly[i], BVHTREE_FROM_FACES, 2); + BKE_bvhtree_from_mesh_get(&treeData[i], me_highpoly[i], BVHTREE_FROM_LOOPTRI, 2); if (treeData[i].tree == NULL) { printf("Baking: out of memory while creating BHVTree for object \"%s\"\n", highpoly[i].ob->id.name + 2); |