[Bf-blender-cvs] [7cc9f6b] master: Minor edits to last commit
Campbell Barton
noreply at git.blender.org
Tue Apr 19 05:06:27 CEST 2016
Commit: 7cc9f6b6f83df811f9236fd58499a19151687428
Author: Campbell Barton
Date: Tue Apr 19 13:07:01 2016 +1000
Branches: master
https://developer.blender.org/rB7cc9f6b6f83df811f9236fd58499a19151687428
Minor edits to last commit
Avoid redundant tests
===================================================================
M source/blender/bmesh/tools/bmesh_decimate_dissolve.c
===================================================================
diff --git a/source/blender/bmesh/tools/bmesh_decimate_dissolve.c b/source/blender/bmesh/tools/bmesh_decimate_dissolve.c
index 9d415e4..0777cb9 100644
--- a/source/blender/bmesh/tools/bmesh_decimate_dissolve.c
+++ b/source/blender/bmesh/tools/bmesh_decimate_dissolve.c
@@ -479,13 +479,15 @@ void BM_mesh_decimate_dissolve_ex(
#ifdef USE_DEGENERATE_CHECK
/* dissolving a vertex may mean vertices we previously weren't able to dissolve
- * can bow be re-evaluated. */
+ * can now be re-evaluated. */
if (e_new->l) {
BMLoop *l_first, *l_iter;
l_iter = l_first = e_new->l;
do {
+ /* skip vertices part of this edge, evaluated above */
BMLoop *l_cycle_first, *l_cycle_iter;
- l_cycle_iter = l_cycle_first = l_iter;
+ l_cycle_iter = l_iter->next->next;
+ l_cycle_first = l_iter->prev;
do {
const int j = BM_elem_index_get(l_cycle_iter->v);
if (j != -1 && vheap_table[j] &&
More information about the Bf-blender-cvs
mailing list