[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58389] trunk/blender/source/blender: code cleanup: use boolean for derived mesh face test function
Campbell Barton
ideasman42 at gmail.com
Fri Jul 19 12:40:52 CEST 2013
Revision: 58389
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58389
Author: campbellbarton
Date: 2013-07-19 10:40:52 +0000 (Fri, 19 Jul 2013)
Log Message:
-----------
code cleanup: use boolean for derived mesh face test function
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_DerivedMesh.h
trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
trunk/blender/source/blender/editors/space_view3d/drawmesh.c
Modified: trunk/blender/source/blender/blenkernel/BKE_DerivedMesh.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_DerivedMesh.h 2013-07-19 10:40:43 UTC (rev 58388)
+++ trunk/blender/source/blender/blenkernel/BKE_DerivedMesh.h 2013-07-19 10:40:52 UTC (rev 58389)
@@ -438,7 +438,7 @@
*/
void (*drawMappedFacesMat)(DerivedMesh *dm,
void (*setMaterial)(void *userData, int, void *attribs),
- int (*setFace)(void *userData, int index), void *userData);
+ bool (*setFace)(void *userData, int index), void *userData);
/** Release reference to the DerivedMesh. This function decides internally
* if the DerivedMesh will be freed, or cached for later use. */
Modified: trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c 2013-07-19 10:40:43 UTC (rev 58388)
+++ trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c 2013-07-19 10:40:52 UTC (rev 58389)
@@ -1424,7 +1424,7 @@
static void cdDM_drawMappedFacesMat(DerivedMesh *dm,
void (*setMaterial)(void *userData, int, void *attribs),
- int (*setFace)(void *userData, int index), void *userData)
+ bool (*setFace)(void *userData, int index), void *userData)
{
CDDerivedMesh *cddm = (CDDerivedMesh *) dm;
GPUVertexAttribs gattribs;
Modified: trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c 2013-07-19 10:40:43 UTC (rev 58388)
+++ trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c 2013-07-19 10:40:52 UTC (rev 58389)
@@ -920,7 +920,7 @@
static void emDM_drawMappedFacesMat(DerivedMesh *dm,
void (*setMaterial)(void *userData, int, void *attribs),
- int (*setFace)(void *userData, int index), void *userData)
+ bool (*setFace)(void *userData, int index), void *userData)
{
EditDerivedBMesh *bmdm = (EditDerivedBMesh *)dm;
BMEditMesh *em = bmdm->em;
Modified: trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c 2013-07-19 10:40:43 UTC (rev 58388)
+++ trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c 2013-07-19 10:40:52 UTC (rev 58389)
@@ -1970,7 +1970,7 @@
/* Only used by non-editmesh types */
static void ccgDM_drawMappedFacesMat(DerivedMesh *dm,
void (*setMaterial)(void *userData, int, void *attribs),
- int (*setFace)(void *userData, int index), void *userData)
+ bool (*setFace)(void *userData, int index), void *userData)
{
CCGDerivedMesh *ccgdm = (CCGDerivedMesh *) dm;
CCGSubSurf *ss = ccgdm->ss;
Modified: trunk/blender/source/blender/editors/space_view3d/drawmesh.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawmesh.c 2013-07-19 10:40:43 UTC (rev 58388)
+++ trunk/blender/source/blender/editors/space_view3d/drawmesh.c 2013-07-19 10:40:52 UTC (rev 58389)
@@ -912,7 +912,7 @@
}
}
-static int tex_mat_set_face_mesh_cb(void *userData, int index)
+static bool tex_mat_set_face_mesh_cb(void *userData, int index)
{
/* faceselect mode face hiding */
TexMatCallback *data = (TexMatCallback *)userData;
@@ -922,7 +922,7 @@
return !(mp->flag & ME_HIDE);
}
-static int tex_mat_set_face_editmesh_cb(void *userData, int index)
+static bool tex_mat_set_face_editmesh_cb(void *userData, int index)
{
/* editmode face hiding */
TexMatCallback *data = (TexMatCallback *)userData;
@@ -960,7 +960,7 @@
{
Mesh *me = ob->data;
TexMatCallback data = {scene, ob, me, dm};
- int (*set_face_cb)(void *, int);
+ bool (*set_face_cb)(void *, int);
int glsl, picking = (G.f & G_PICKSEL);
/* face hiding callback depending on mode */
More information about the Bf-blender-cvs
mailing list