[Bf-blender-cvs] [71d6fbcd516] master: Fix missing error message on convex hull failure

[Campbell Barton]

Commit: 71d6fbcd516db196d68088319ede5d2ffd254d71
Author: Campbell Barton
Date:   Thu Feb 20 11:18:40 2020 +1100
Branches: master
https://developer.blender.org/rB71d6fbcd516db196d68088319ede5d2ffd254d71

Fix missing error message on convex hull failure

Also remove unused errors.

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

M	source/blender/bmesh/intern/bmesh_error.h
M	source/blender/bmesh/intern/bmesh_operators.c

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

diff --git a/source/blender/bmesh/intern/bmesh_error.h b/source/blender/bmesh/intern/bmesh_error.h
index b5235c64215..7353012170c 100644
--- a/source/blender/bmesh/intern/bmesh_error.h
+++ b/source/blender/bmesh/intern/bmesh_error.h
@@ -54,13 +54,8 @@ void BMO_error_clear(BMesh *bm);
 
 /*error messages*/
 enum {
-  BMERR_SELF_INTERSECTING = 1,
-  BMERR_DISSOLVEDISK_FAILED,
-  BMERR_CONNECTVERT_FAILED,
-  BMERR_WALKER_FAILED,
+  BMERR_CONNECTVERT_FAILED = 1,
   BMERR_DISSOLVEFACES_FAILED,
-  BMERR_TESSELLATION,
-  BMERR_NONMANIFOLD,
   BMERR_INVALID_SELECTION,
   BMERR_MESH_ERROR,
   BMERR_CONVEX_HULL_FAILED,
diff --git a/source/blender/bmesh/intern/bmesh_operators.c b/source/blender/bmesh/intern/bmesh_operators.c
index 2534a8c35ad..d4a3ecb73db 100644
--- a/source/blender/bmesh/intern/bmesh_operators.c
+++ b/source/blender/bmesh/intern/bmesh_operators.c
@@ -44,18 +44,14 @@ static int bmo_name_to_slotcode_check(BMOpSlot slot_args[BMO_OP_MAX_SLOTS],
 
 static const char *bmo_error_messages[] = {
     NULL,
-    N_("Self intersection error"),
-    N_("Could not dissolve vert"),
     N_("Could not connect vertices"),
-    N_("Could not traverse mesh"),
     N_("Could not dissolve faces"),
-    N_("Tessellation error"),
-    N_("Cannot deal with non-manifold geometry"),
     N_("Invalid selection"),
     N_("Internal mesh error"),
+    N_("Convex hull failed"),
 };
 
-BLI_STATIC_ASSERT(ARRAY_SIZE(bmo_error_messages) + 1 == BMERR_TOTAL, "message mismatch");
+BLI_STATIC_ASSERT(ARRAY_SIZE(bmo_error_messages) == BMERR_TOTAL, "message mismatch");
 
 /* operator slot type information - size of one element of the type given. */
 const int BMO_OPSLOT_TYPEINFO[BMO_OP_SLOT_TOTAL_TYPES] = {