[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36661] branches/bmesh/blender/source/ blender/bmesh: skip assigning vars for inline bmesh flag funcs, just cast.

[Campbell Barton]

Revision: 36661
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36661
Author:   campbellbarton
Date:     2011-05-13 10:59:30 +0000 (Fri, 13 May 2011)
Log Message:
-----------
skip assigning vars for inline bmesh flag funcs, just cast.

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/bmesh/bmesh.h
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_inline.c

Modified: branches/bmesh/blender/source/blender/bmesh/bmesh.h
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/bmesh.h	2011-05-13 10:49:26 UTC (rev 36660)
+++ branches/bmesh/blender/source/blender/bmesh/bmesh.h	2011-05-13 10:59:30 UTC (rev 36661)
@@ -143,18 +143,18 @@
 struct BMFace *BM_Make_Ngon ( struct BMesh *bm, struct BMVert *v1, struct BMVert *v2, struct BMEdge **edges, int len, int nodouble );
 
 /*stuff for dealing with header flags*/
-BM_INLINE int BM_TestHFlag(void *element, int flag);
+BM_INLINE int BM_TestHFlag(void *element, const int flag);
 
 /*stuff for dealing with header flags*/
-BM_INLINE void BM_SetHFlag(void *element, int flag);
+BM_INLINE void BM_SetHFlag(void *element, const int flag);
 
 /*stuff for dealing with header flags*/
-BM_INLINE void BM_ClearHFlag(void *element, int flag);
+BM_INLINE void BM_ClearHFlag(void *element, const int flag);
 
 /*stuff for dealing BM_ToggleHFlag header flags*/
-BM_INLINE void BM_ToggleHFlag(void *element, int flag);
-BM_INLINE void BM_SetIndex(void *element, int index);
-BM_INLINE int BM_GetIndex(void *element);
+BM_INLINE void BM_ToggleHFlag(void *element, const int flag);
+BM_INLINE void BM_SetIndex(void *element, const int index);
+BM_INLINE int BM_GetIndex(const void *element);
 
 /*copies loop data from adjacent faces*/
 void BM_Face_CopyShared ( BMesh *bm, BMFace *f );

Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_inline.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_inline.c	2011-05-13 10:49:26 UTC (rev 36660)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_inline.c	2011-05-13 10:59:30 UTC (rev 36661)
@@ -3,43 +3,38 @@
 
 #include "bmesh.h"
 
-BM_INLINE int BM_TestHFlag(void *element, int flag)
+BM_INLINE int BM_TestHFlag(void *element, const int flag)
 {
 	BMHeader *e = element;
 	return e->flag & flag;
 }
 
 /*stuff for dealing with header flags*/
-BM_INLINE void BM_SetHFlag(void *element, int flag)
+BM_INLINE void BM_SetHFlag(void *element, const int flag)
 {
-	BMHeader *e = element;
-	e->flag |= flag;
+	((BMHeader *)element)->flag |= flag;
 }
 
 /*stuff for dealing with header flags*/
-BM_INLINE void BM_ClearHFlag(void *element, int flag)
+BM_INLINE void BM_ClearHFlag(void *element, const int flag)
 {
-	BMHeader *e = element;
-	e->flag &= ~flag;
+	((BMHeader *)element)->flag &= ~flag;
 }
 
 /*stuff for dealing BM_ToggleHFlag header flags*/
-BM_INLINE void BM_ToggleHFlag(void *element, int flag)
+BM_INLINE void BM_ToggleHFlag(void *element, const int flag)
 {
-	BMHeader *e = element;
-	e->flag ^= flag;
+	((BMHeader *)element)->flag ^= flag;
 }
 
-BM_INLINE void BM_SetIndex(void *element, int index)
+BM_INLINE void BM_SetIndex(void *element, const int index)
 {
-	BMHeader *e = element;
-	e->index = index;
+	((BMHeader *)element)->index = index;
 }
 
-BM_INLINE int BM_GetIndex(void *element)
+BM_INLINE int BM_GetIndex(const void *element)
 {
-	BMHeader *e = element;
-	return e->index;
+	return ((BMHeader *)element)->index;
 }
 
 #endif /*BM_INLINE_C*/