diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-06-28 13:59:49 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-06-29 00:57:23 +0300 |
commit | 21173347370f75ed5292445aead1de384081d8e4 (patch) | |
tree | 53e9d43d0c87ed1e7eea50e50e1adc7895a92e56 /source/blender | |
parent | a1a40bfe70574f124b9c3f1c07d22c2b2d88d4f6 (diff) |
Fix assert calculating tangents with no faces
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/intern/editmesh_tangent.c | 5 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/mesh_tangent.c | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/editmesh_tangent.c b/source/blender/blenkernel/intern/editmesh_tangent.c index b04fc753f7a..ee13a887a5f 100644 --- a/source/blender/blenkernel/intern/editmesh_tangent.c +++ b/source/blender/blenkernel/intern/editmesh_tangent.c @@ -336,7 +336,7 @@ void BKE_editmesh_loop_tangent_calc( } #endif /* Calculation */ - { + if (em->tottri != 0) { TaskScheduler *scheduler = BLI_task_scheduler_get(); TaskPool *task_pool; task_pool = BLI_task_pool_create(scheduler, NULL); @@ -396,6 +396,9 @@ void BKE_editmesh_loop_tangent_calc( BLI_task_pool_work_and_wait(task_pool); BLI_task_pool_free(task_pool); } + else { + tangent_mask_curr = tangent_mask; + } #ifdef USE_LOOPTRI_DETECT_QUADS if (face_as_quad_map) { MEM_freeN(face_as_quad_map); diff --git a/source/blender/blenkernel/intern/mesh_tangent.c b/source/blender/blenkernel/intern/mesh_tangent.c index b9d1025d7b1..669b59bca05 100644 --- a/source/blender/blenkernel/intern/mesh_tangent.c +++ b/source/blender/blenkernel/intern/mesh_tangent.c @@ -602,7 +602,7 @@ void BKE_mesh_calc_loop_tangent_ex( #endif /* Calculation */ - { + if (looptri_len != 0) { TaskScheduler *scheduler = BLI_task_scheduler_get(); TaskPool *task_pool; task_pool = BLI_task_pool_create(scheduler, NULL); @@ -653,6 +653,9 @@ void BKE_mesh_calc_loop_tangent_ex( BLI_task_pool_work_and_wait(task_pool); BLI_task_pool_free(task_pool); } + else { + tangent_mask_curr = tangent_mask; + } #ifdef USE_LOOPTRI_DETECT_QUADS if (face_as_quad_map) { MEM_freeN(face_as_quad_map); |