[Bf-blender-cvs] [96d487b3ae1] master: Cleanup: remove redundant calls to BMO_error_clear

Campbell Barton noreply at git.blender.org
Thu Jul 1 09:26:50 CEST 2021


Commit: 96d487b3ae112281290cfea8314771df55d0843d
Author: Campbell Barton
Date:   Thu Jul 1 17:25:27 2021 +1000
Branches: master
https://developer.blender.org/rB96d487b3ae112281290cfea8314771df55d0843d

Cleanup: remove redundant calls to BMO_error_clear

===================================================================

M	source/blender/bmesh/operators/bmo_dissolve.c
M	source/blender/bmesh/operators/bmo_triangulate.c
M	source/blender/bmesh/tools/bmesh_decimate_dissolve.c

===================================================================

diff --git a/source/blender/bmesh/operators/bmo_dissolve.c b/source/blender/bmesh/operators/bmo_dissolve.c
index b80df4cce58..30c80d43b9c 100644
--- a/source/blender/bmesh/operators/bmo_dissolve.c
+++ b/source/blender/bmesh/operators/bmo_dissolve.c
@@ -182,12 +182,6 @@ void bmo_dissolve_faces_exec(BMesh *bm, BMOperator *op)
       BMO_face_flag_enable(bm, f_iter, FACE_ORIG);
     }
 
-    if (BMO_error_occurred(bm)) {
-      BMO_error_clear(bm);
-      BMO_error_raise(bm, op, "Could not dissolve faces");
-      goto cleanup;
-    }
-
     BLI_array_append(faces, NULL);
     BLI_array_append(regions, faces);
   }
diff --git a/source/blender/bmesh/operators/bmo_triangulate.c b/source/blender/bmesh/operators/bmo_triangulate.c
index b07494345ab..f6d612f31eb 100644
--- a/source/blender/bmesh/operators/bmo_triangulate.c
+++ b/source/blender/bmesh/operators/bmo_triangulate.c
@@ -253,9 +253,6 @@ void bmo_triangle_fill_exec(BMesh *bm, BMOperator *op)
             BMO_face_flag_enable(bm, f_new, ELE_NEW);
             BM_edge_kill(bm, e);
           }
-          else {
-            BMO_error_clear(bm);
-          }
         }
         else if (e->l == NULL) {
           BM_edge_kill(bm, e);
diff --git a/source/blender/bmesh/tools/bmesh_decimate_dissolve.c b/source/blender/bmesh/tools/bmesh_decimate_dissolve.c
index 8b4a9bb26ac..036dae1b9bd 100644
--- a/source/blender/bmesh/tools/bmesh_decimate_dissolve.c
+++ b/source/blender/bmesh/tools/bmesh_decimate_dissolve.c
@@ -376,9 +376,6 @@ void BM_mesh_decimate_dissolve_ex(BMesh *bm,
             }
           } while ((l_iter = l_iter->next) != l_first);
         }
-        else {
-          BMO_error_clear(bm);
-        }
       }
 
       if (UNLIKELY(f_new == NULL)) {



More information about the Bf-blender-cvs mailing list