Commit: 1c0b6c4f30d2e7e2c32f4b6165c52d18572ce8ab
Author: Campbell Barton
Date: Thu Apr 17 19:33:54 2014 +1000
https://developer.blender.org/rB1c0b6c4f30d2e7e2c32f4b6165c52d18572ce8ab
Code cleanup: use bools for DM
===================================================================
M source/blender/blenkernel/BKE_DerivedMesh.h
M source/blender/blenkernel/BKE_pbvh.h
M source/blender/blenkernel/intern/DerivedMesh.c
M source/blender/blenkernel/intern/cdderivedmesh.c
M source/blender/blenkernel/intern/editderivedmesh.c
M source/blender/blenkernel/intern/subsurf_ccg.c
M source/blender/editors/space_view3d/drawobject.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h
b/source/blender/blenkernel/BKE_DerivedMesh.h
index 5206f8b..a9e78b7 100644
--- a/source/blender/blenkernel/BKE_DerivedMesh.h
+++ b/source/blender/blenkernel/BKE_DerivedMesh.h
@@ -359,7 +359,7 @@ struct DerivedMesh {
*
* Also called for *final* editmode DerivedMeshes
*/
- void (*drawEdges)(DerivedMesh *dm, int drawLooseEdges, int
drawAllEdges);
+ void (*drawEdges)(DerivedMesh *dm, bool drawLooseEdges, bool
drawAllEdges);
/** Draw all loose edges (edges w/ no adjoining faces) */
void (*drawLooseEdges)(DerivedMesh *dm);
@@ -372,7 +372,7 @@ struct DerivedMesh {
* Also called for *final* editmode DerivedMeshes
*/
void (*drawFacesSolid)(DerivedMesh *dm, float
(*partial_redraw_planes)[4],
- int fast, DMSetMaterial setMaterial);
+ bool fast, DMSetMaterial setMaterial);
/** Draw all faces using MTFace
* - Drawing options too complicated to enumerate, look at code.
@@ -451,7 +451,7 @@ struct DerivedMesh {
* - setFace is called to verify if a face must be hidden
*/
void (*drawMappedFacesMat)(DerivedMesh *dm,
- void (*setMaterial)(void *userData, int,
void *attribs),
+ void (*setMaterial)(void *userData, int
matnr, void *attribs),
bool (*setFace)(void *userData, int index),
void *userData);
/** Release reference to the DerivedMesh. This function decides
internally
diff --git a/source/blender/blenkernel/BKE_pbvh.h
b/source/blender/blenkernel/BKE_pbvh.h
index 79a41f0..d29ded6 100644
--- a/source/blender/blenkernel/BKE_pbvh.h
+++ b/source/blender/blenkernel/BKE_pbvh.h
@@ -111,7 +111,7 @@ void BKE_pbvh_raycast_project_ray_root(PBVH *bvh, bool
original, float ray_start
void BKE_pbvh_node_draw(PBVHNode *node, void *data);
void BKE_pbvh_draw(PBVH *bvh, float (*planes)[4], float (*face_nors)[3],
- int (*setMaterial)(int, void *attribs), bool wireframe);
+ int (*setMaterial)(int matnr, void *attribs), bool
wireframe);
/* PBVH Access */
typedef enum {
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c
b/source/blender/blenkernel/intern/DerivedMesh.c
index 0c4e714..c35efc8 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -3142,7 +3142,7 @@ static void navmesh_DM_drawFacesTex(DerivedMesh *dm,
static void navmesh_DM_drawFacesSolid(DerivedMesh *dm,
float (*partial_redraw_planes)[4],
- int UNUSED(fast), DMSetMaterial
setMaterial)
+ bool UNUSED(fast), DMSetMaterial
setMaterial)
{
(void) partial_redraw_planes;
(void) setMaterial;
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c
b/source/blender/blenkernel/intern/cdderivedmesh.c
index b1bf1b4..7faeecb 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -421,7 +421,7 @@ static void cdDM_drawUVEdges(DerivedMesh *dm)
}
}
-static void cdDM_drawEdges(DerivedMesh *dm, int drawLooseEdges, int
drawAllEdges)
+static void cdDM_drawEdges(DerivedMesh *dm, bool drawLooseEdges, bool
drawAllEdges)
{
CDDerivedMesh *cddm = (CDDerivedMesh *) dm;
MVert *mvert = cddm->mvert;
@@ -531,7 +531,7 @@ static void cdDM_drawLooseEdges(DerivedMesh *dm)
static void cdDM_drawFacesSolid(DerivedMesh *dm,
float (*partial_redraw_planes)[4],
- int UNUSED(fast), DMSetMaterial setMaterial)
+ bool UNUSED(fast), DMSetMaterial setMaterial)
{
CDDerivedMesh *cddm = (CDDerivedMesh *) dm;
MVert *mvert = cddm->mvert;
@@ -1511,7 +1511,7 @@ static void cdDM_drawFacesGLSL(DerivedMesh *dm,
DMSetMaterial setMaterial)
}
static void cdDM_drawMappedFacesMat(DerivedMesh *dm,
- void (*setMaterial)(void *userData, int,
void *attribs),
+ void (*setMaterial)(void *userData, int
matnr, void *attribs),
bool (*setFace)(void *userData, int
index), void *userData)
{
CDDerivedMesh *cddm = (CDDerivedMesh *) dm;
diff --git a/source/blender/blenkernel/intern/editderivedmesh.c
b/source/blender/blenkernel/intern/editderivedmesh.c
index 19a621a..d4af176 100644
--- a/source/blender/blenkernel/intern/editderivedmesh.c
+++ b/source/blender/blenkernel/intern/editderivedmesh.c
@@ -298,8 +298,8 @@ static void emDM_drawMappedEdges(DerivedMesh *dm,
}
}
static void emDM_drawEdges(DerivedMesh *dm,
- int UNUSED(drawLooseEdges),
- int UNUSED(drawAllEdges))
+ bool UNUSED(drawLooseEdges),
+ bool UNUSED(drawAllEdges))
{
emDM_drawMappedEdges(dm, NULL, NULL);
}
@@ -1058,13 +1058,13 @@ static void emDM_drawMappedFacesGLSL(DerivedMesh *dm,
}
static void emDM_drawFacesGLSL(DerivedMesh *dm,
- int (*setMaterial)(int, void *attribs))
+ int (*setMaterial)(int matnr, void *attribs))
{
dm->drawMappedFacesGLSL(dm, setMaterial, NULL, NULL);
}
static void emDM_drawMappedFacesMat(DerivedMesh *dm,
- void (*setMaterial)(void *userData, int,
void *attribs),
+ void (*setMaterial)(void *userData, int
matnr, void *attribs),
bool (*setFace)(void *userData, int
index), void *userData)
{
EditDerivedBMesh *bmdm = (EditDerivedBMesh *)dm;
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c
b/source/blender/blenkernel/intern/subsurf_ccg.c
index 6a3b060..252d513 100644
--- a/source/blender/blenkernel/intern/subsurf_ccg.c
+++ b/source/blender/blenkernel/intern/subsurf_ccg.c
@@ -1612,7 +1612,7 @@ static void ccgdm_pbvh_update(CCGDerivedMesh *ccgdm)
}
}
-static void ccgDM_drawEdges(DerivedMesh *dm, int drawLooseEdges, int
drawAllEdges)
+static void ccgDM_drawEdges(DerivedMesh *dm, bool drawLooseEdges, bool
drawAllEdges)
{
CCGDerivedMesh *ccgdm = (CCGDerivedMesh *) dm;
CCGSubSurf *ss = ccgdm->ss;
@@ -1725,7 +1725,7 @@ static void ccgDM_glNormalFast(float *a, float *b, float
*c, float *d)
}
/* Only used by non-editmesh types */
-static void ccgDM_drawFacesSolid(DerivedMesh *dm, float
(*partial_redraw_planes)[4], int fast, DMSetMaterial setMaterial)
+static void ccgDM_drawFacesSolid(DerivedMesh *dm, float
(*partial_redraw_planes)[4], bool fast, DMSetMaterial setMaterial)
{
CCGDerivedMesh *ccgdm = (CCGDerivedMesh *) dm;
CCGSubSurf *ss = ccgdm->ss;
@@ -2085,7 +2085,7 @@ static void ccgDM_drawFacesGLSL(DerivedMesh *dm,
DMSetMaterial setMaterial)
/* Only used by non-editmesh types */
static void ccgDM_drawMappedFacesMat(DerivedMesh *dm,
- void (*setMaterial)(void *userData, int,
void *attribs),
+ void (*setMaterial)(void *userData, int
matnr, void *attribs),
bool (*setFace)(void *userData, int
index), void *userData)
{
CCGDerivedMesh *ccgdm = (CCGDerivedMesh *) dm;
diff --git a/source/blender/editors/space_view3d/drawobject.c
b/source/blender/editors/space_view3d/drawobject.c
index 02fad5d..f4a1472 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -3562,7 +3562,7 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar,
View3D *v3d, RegionView3D
GPUVertexAttribs gattribs;
float planes[4][4];
float (*fpl)[4] = NULL;
- int fast = (p->flags & PAINT_FAST_NAVIGATE) &&
(rv3d->rflag & RV3D_NAVIGATING);
+ const bool fast = (p->flags &
PAINT_FAST_NAVIGATE) && (rv3d->rflag & RV3D_NAVIGATING);
if (ob->sculpt->partial_redraw) {
if (ar->do_draw & RGN_DRAW_PARTIAL) {
@@ -3660,7 +3660,7 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar,
View3D *v3d, RegionView3D
if (ob->sculpt && (p = BKE_paint_get_active(scene))) {
float planes[4][4];
float (*fpl)[4] = NULL;
- int fast = (p->flags & PAINT_FAST_NAVIGATE) &&
(rv3d->rflag & RV3D_NAVIGATING);
+ const bool fast = (p->flags &
PAINT_FAST_NAVIGATE) && (rv3d->rflag & RV3D_NAVIGATING);
if (ob->sculpt->partial_redraw) {
if (ar->do_draw & RGN_DRAW_PARTIAL) {
@@ -3728,7 +3728,7 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar,
View3D *v3d, RegionView3D
glDepthMask(0); /* disable write in zbuffer, selected
edge wires show better */
}
- dm->drawEdges(dm, (dt == OB_WIRE || totface == 0), (ob->dtx &
OB_DRAW_ALL_EDGES));
+ dm->drawEdges(dm, (dt == OB_WIRE || totface == 0), (ob->dtx &
OB_DRAW_ALL_EDGES) != 0);
if (dt != OB_WIRE && (draw_wire == OBDRAW_WIRE_ON_DEPTH)) {
glDepthMask(1);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
