[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18621] branches/bmesh/blender/source/ blender/bmesh/intern: changed bmesh_api_set/getindex to be just macros, and shortened to bmesh_api_get/seti

Joseph Eagar joeedh at gmail.com
Thu Jan 22 13:34:52 CET 2009


Revision: 18621
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18621
Author:   joeedh
Date:     2009-01-22 13:34:52 +0100 (Thu, 22 Jan 2009)

Log Message:
-----------
changed bmesh_api_set/getindex to be just macros, and shortened to bmesh_api_get/seti

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

Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c	2009-01-22 12:29:08 UTC (rev 18620)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c	2009-01-22 12:34:52 UTC (rev 18621)
@@ -49,22 +49,6 @@
 	printf("BM modelling error!");
 }
 
-#ifndef bmesh_api_setindex
-/*NOTE: ensure different parts of the API do not conflict
-  on using this!*/
-void bmesh_api_setindex(BMesh *bm, BMHeader *head, int i)
-{
-	head->flags[bm->stackdepth-1].pflag = i;
-}
-#endif
-
-#ifndef bmesh_api_getindex
-int bmesh_api_getindex(BMesh *bm, BMHeader *head)
-{
-	return head->flags[bm->stackdepth-1].pflag;
-}
-#endif
-
 /*
  * BMESH SET SYSFLAG
  *

Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_private.h
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_private.h	2009-01-22 12:29:08 UTC (rev 18620)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_private.h	2009-01-22 12:34:52 UTC (rev 18621)
@@ -59,16 +59,11 @@
 int bmesh_test_sysflag(struct BMHeader *element, int flag);
 
 /*NOTE: ensure different parts of the API do not conflict
-  on using this!*/
-/*used to access the index member of the current flag layer.
-  actual functions are only defined if the below macro versions
-  are not.*/
-void bmesh_api_setindex(BMesh *bm, BMHeader *head, int i);
-int bmesh_api_getindex(BMesh *bm, BMHeader *head);
+  on using this!  sets and gets the API index member 
+  of the current flag layer.*/
+#define bmesh_api_seti(bm, head, i) ((head)->flags[bm->stackdepth-1].pflag = i)
+#define bmesh_api_geti(bm, head) ((head)->flags[bm->stackdepth-1].pflag)
 
-#define bmesh_api_setindex(bm, head, i) ((head)->flags[bm->stackdepth-1].pflag = i)
-#define bmesh_api_getindex(bm, head) ((head)->flags[bm->stackdepth-1].pflag)
-
 /*Polygon Utilities ? FIXME... where do these each go?*/
 /*newedgeflag sets a flag layer flag, obviously not the header flag.*/
 void BM_Triangulate_Face(BMesh *bm, BMFace *f, float (*projectverts)[3], int newedgeflag, int newfaceflag);





More information about the Bf-blender-cvs mailing list