[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43950] branches/bmesh/blender/source/ blender/bmesh: Code Cleanup: remove unused operator flags
Campbell Barton
ideasman42 at gmail.com
Tue Feb 7 14:10:11 CET 2012
Revision: 43950
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43950
Author: campbellbarton
Date: 2012-02-07 13:10:01 +0000 (Tue, 07 Feb 2012)
Log Message:
-----------
Code Cleanup: remove unused operator flags
Modified Paths:
--------------
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c
branches/bmesh/blender/source/blender/bmesh/operators/bevel.c
branches/bmesh/blender/source/blender/bmesh/operators/subdivideop.c
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c 2012-02-07 12:47:17 UTC (rev 43949)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c 2012-02-07 13:10:01 UTC (rev 43950)
@@ -51,17 +51,17 @@
static int bmesh_opname_to_opcode(const char *opname);
static const char *bmop_error_messages[] = {
- NULL,
- "Self intersection error",
- "Could not dissolve vert",
- "Could not connect vertices",
- "Could not traverse mesh",
- "Could not dissolve faces",
- "Could not dissolve vertices",
- "Tesselation error",
- "Can not deal with non-manifold geometry",
- "Invalid selection",
- "Internal mesh error",
+ NULL,
+ "Self intersection error",
+ "Could not dissolve vert",
+ "Could not connect vertices",
+ "Could not traverse mesh",
+ "Could not dissolve faces",
+ "Could not dissolve vertices",
+ "Tesselation error",
+ "Can not deal with non-manifold geometry",
+ "Invalid selection",
+ "Internal mesh error",
};
@@ -536,7 +536,7 @@
#endif
void BMO_Mapping_To_Flag(struct BMesh *bm, struct BMOperator *op,
- const char *slotname, int flag)
+ const char *slotname, int flag)
{
GHashIterator it;
BMOpSlot *slot = BMO_GetSlot(op, slotname);
@@ -961,7 +961,7 @@
}
void *BMO_IterNew(BMOIter *iter, BMesh *UNUSED(bm), BMOperator *op,
- const char *slotname, const char restrictmask)
+ const char *slotname, const char restrictmask)
{
BMOpSlot *slot = BMO_GetSlot(op, slotname);
Modified: branches/bmesh/blender/source/blender/bmesh/operators/bevel.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/bevel.c 2012-02-07 12:47:17 UTC (rev 43949)
+++ branches/bmesh/blender/source/blender/bmesh/operators/bevel.c 2012-02-07 13:10:01 UTC (rev 43950)
@@ -39,10 +39,9 @@
#define FACE_NEW 4
#define EDGE_OLD 8
#define FACE_OLD 16
-#define FACE_DONE 32
-#define VERT_OLD 64
-#define FACE_SPAN 128
-#define FACE_HOLE 256
+#define VERT_OLD 32
+#define FACE_SPAN 64
+#define FACE_HOLE 128
typedef struct LoopTag {
BMVert *newv;
Modified: branches/bmesh/blender/source/blender/bmesh/operators/subdivideop.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/subdivideop.c 2012-02-07 12:47:17 UTC (rev 43949)
+++ branches/bmesh/blender/source/blender/bmesh/operators/subdivideop.c 2012-02-07 13:10:01 UTC (rev 43950)
@@ -54,20 +54,10 @@
/* I don't think new faces are flagged, currently, but
* better safe than sorry. */
-#define FACE_NEW 4
-#define FACE_CUSTOMFILL 8
-#define ELE_INNER 16
-#define ELE_SPLIT 32
-#define ELE_CONNECT 64
+#define FACE_CUSTOMFILL 4
+#define ELE_INNER 8
+#define ELE_SPLIT 16
-/* stuff for the flag paramter. note that
- * what used to live in "beauty" and
- * in "seltype" live here. still have to
- * convert the beauty flags over, which
- * is why it starts at 128 (to avoid
- * collision). */
-#define SELTYPE_INNER 128
-
/*
* NOTE: beauty has been renamed to flag!
*/
More information about the Bf-blender-cvs
mailing list