Merge branch 'master' into geometry-nodes-unnamed-attributes

1 files changed, 2 insertions, 9 deletions

diff --git a/source/blender/bmesh/operators/bmo_dissolve.c b/source/blender/bmesh/operators/bmo_dissolve.c
index 7813e30e2a8..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, BMERR_DISSOLVEFACES_FAILED, NULL);
-      goto cleanup;
-    }
-
     BLI_array_append(faces, NULL);
     BLI_array_append(regions, faces);
   }
@@ -201,8 +195,7 @@ void bmo_dissolve_faces_exec(BMesh *bm, BMOperator *op)
 
     faces = regions[i];
     if (!faces[0]) {
-      BMO_error_raise(
-          bm, op, BMERR_DISSOLVEFACES_FAILED, "Could not find boundary of dissolve region");
+      BMO_error_raise(bm, op, "Could not find boundary of dissolve region");
       goto cleanup;
     }
 
@@ -220,7 +213,7 @@ void bmo_dissolve_faces_exec(BMesh *bm, BMOperator *op)
       totface_target -= tot - 1;
     }
     else {
-      BMO_error_raise(bm, op, BMERR_DISSOLVEFACES_FAILED, "Could not create merged face");
+      BMO_error_raise(bm, op, "Could not create merged face");
       goto cleanup;
     }