diff options
| author | Alexander Romanov <a.romanov@blend4web.com> | 2017-07-04 16:03:04 +0300 |
|---|---|---|
| committer | Alexander Romanov <a.romanov@blend4web.com> | 2017-07-04 16:25:49 +0300 |
| commit | 0ef48ad504350b934af42ddf47f73c9e096ce846 (patch) | |
| tree | 640ac747907c1e9117938f2c39799ae66174ddc0 /source/blender/blenkernel/intern/editmesh_tangent.c | |
| parent | f23ed929ee021e11e8d47973d25f9039e9f91c17 (diff) | |
One more fix for merged 'normal map tangents not working correctly when there are no UV maps.'
Diffstat (limited to 'source/blender/blenkernel/intern/editmesh_tangent.c')
| -rw-r--r-- | source/blender/blenkernel/intern/editmesh_tangent.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/editmesh_tangent.c b/source/blender/blenkernel/intern/editmesh_tangent.c index 314c50d42c6..589c346b248 100644 --- a/source/blender/blenkernel/intern/editmesh_tangent.c +++ b/source/blender/blenkernel/intern/editmesh_tangent.c @@ -287,8 +287,6 @@ void BKE_editmesh_loop_tangent_calc( { BMesh *bm = em->bm; - BLI_assert(CustomData_number_of_layers(&bm->ldata, CD_MLOOPUV) != 0); - int act_uv_n = -1; int ren_uv_n = -1; bool calc_act = false; @@ -374,7 +372,7 @@ void BKE_editmesh_loop_tangent_calc( continue; /* needed for orco lookups */ htype_index |= BM_VERT; - *tangent_mask_curr_p |= DM_TANGENT_MASK_ORCO; + tangent_mask_curr |= DM_TANGENT_MASK_ORCO; } else { /* Fill the resulting tangent_mask */ @@ -382,7 +380,7 @@ void BKE_editmesh_loop_tangent_calc( int uv_start = CustomData_get_layer_index(&bm->ldata, CD_MLOOPUV); BLI_assert(uv_ind != -1 && uv_start != -1); BLI_assert(uv_ind - uv_start < MAX_MTFACE); - *tangent_mask_curr_p |= 1 << (uv_ind - uv_start); + tangent_mask_curr |= 1 << (uv_ind - uv_start); } if (mesh2tangent->precomputedFaceNormals) { /* needed for face normal lookups */ |