Revision: 44047
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44047
Author: campbellbarton
Date: 2012-02-12 06:09:22 +0000 (Sun, 12 Feb 2012)
Log Message:
-----------
remove some unused defines
Modified Paths:
--------------
branches/bmesh/blender/source/blender/bmesh/bmesh.h
branches/bmesh/blender/source/blender/bmesh/bmesh_operator_api.h
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_private.h
Modified: branches/bmesh/blender/source/blender/bmesh/bmesh.h
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/bmesh.h 2012-02-12 00:43:57 UTC
(rev 44046)
+++ branches/bmesh/blender/source/blender/bmesh/bmesh.h 2012-02-12 06:09:22 UTC
(rev 44047)
@@ -94,17 +94,18 @@
#define BM_SELECT (1<<0)
#define BM_SEAM (1<<1)
-#define BM_FGON (1<<2)
-#define BM_HIDDEN (1<<3)
-#define BM_SHARP (1<<4)
-#define BM_SMOOTH (1<<5)
-#define BM_ACTIVE (1<<6)
-#define BM_TMP_TAG (1<<7) /* internal flag, used for ensuring correct
normals
+#define BM_HIDDEN (1<<2)
+#define BM_SHARP (1<<3)
+#define BM_SMOOTH (1<<4)
+#define BM_TMP_TAG (1<<5) /* internal flag, used for ensuring correct
normals
* during multires interpolation, and any other time
* when temp tagging is handy.
* always assume dirty & clear before use. */
-/* #define BM_NONORMCALC (1<<8) */ /* UNUSED */
+/* we have 2 spare flags which is awesome but since we're limited to 8
+ * only add new flags with care! - campbell */
+/* #define BM_TMP_SPARE (1<<6) */
+/* #define BM_NONORMCALC (1<<7) */ /* UNUSED */
/* stub */
void bmesh_error(void);
Modified: branches/bmesh/blender/source/blender/bmesh/bmesh_operator_api.h
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/bmesh_operator_api.h
2012-02-12 00:43:57 UTC (rev 44046)
+++ branches/bmesh/blender/source/blender/bmesh/bmesh_operator_api.h
2012-02-12 06:09:22 UTC (rev 44047)
@@ -89,7 +89,7 @@
//it's very important this remain a power of two
#define BMOP_OPSLOT_ELEMENT_BUF 8
#define BMOP_OPSLOT_MAPPING 9
-#define BMOP_OPSLOT_TYPES 10
+/* #define BMOP_OPSLOT_TOTAL_TYPES 10 */ /* not used yet */
/* please ignore all these structures, don't touch them in tool code, except
* for when your defining an operator with BMOpDefine.*/
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c
2012-02-12 00:43:57 UTC (rev 44046)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c
2012-02-12 06:09:22 UTC (rev 44047)
@@ -1097,37 +1097,6 @@
return errorcode;
}
-#if 0
-typedef struct BMOFlag {
- const char *str;
- int flag;
-} BMOFlag;
-
-#define PAIR(f) {#f, f},fv
-static const char *bmesh_flags = {
- PAIR(BM_SELECT);
- PAIR(BM_SEAM);
- PAIR(BM_FGON);
- PAIR(BM_HIDDEN);
- PAIR(BM_SHARP);
- PAIR(BM_SMOOTH);
- {NULL, 0};
-};
-#undef PAIR
-
-int bmesh_str_to_flag(const char *str)
-{
- int i;
-
- while (bmesh_flags[i]->name) {
- if (!strcmp(bmesh_flags[i]->name, str))
- return bmesh_flags[i]->flag;
- }
-
- return -1;
-}
-#endif
-
/* example:
* BMO_CallOp(bm, "del %d %hv", DEL_ONLYFACES, BM_SELECT);
*
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_private.h
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_private.h
2012-02-12 00:43:57 UTC (rev 44046)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_private.h
2012-02-12 06:09:22 UTC (rev 44047)
@@ -69,8 +69,7 @@
/* NOTE: ensure different parts of the API do not conflict
* on using these internal flags!*/
#define _FLAG_JF 1 /* join faces */
-#define _FLAG_SF 2 /* split faces */
-#define _FLAG_MF 4 /* make face */
+#define _FLAG_MF 2 /* make face */
#define bmesh_api_setflag(element, f) (((BMHeader*)(element))->flags[0].pflag
|= (f))
#define bmesh_api_getflag(element, f) (((BMHeader*)(element))->flags[0].pflag
& (f))
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
