[Bf-blender-cvs] [37026b1] master: Code cleanup: use bool for static methods
Campbell Barton
noreply at git.blender.org
Wed Feb 5 12:36:52 CET 2014
Commit: 37026b12ec1047dd5f4637ad281f108a7963af83
Author: Campbell Barton
Date: Wed Feb 5 22:36:15 2014 +1100
https://developer.blender.org/rB37026b12ec1047dd5f4637ad281f108a7963af83
Code cleanup: use bool for static methods
===================================================================
M source/blender/avi/intern/avi.c
M source/blender/blenkernel/BKE_dynamicpaint.h
M source/blender/blenkernel/BKE_lattice.h
M source/blender/blenkernel/intern/customdata.c
M source/blender/blenkernel/intern/dynamicpaint.c
M source/blender/blenkernel/intern/editderivedmesh.c
M source/blender/blenkernel/intern/lattice.c
M source/blender/blenkernel/intern/material.c
M source/blender/blenkernel/intern/nla.c
M source/blender/blenkernel/intern/object.c
M source/blender/blenkernel/intern/pbvh_bmesh.c
M source/blender/blenkernel/intern/sequencer.c
M source/blender/blenkernel/intern/text.c
M source/blender/blenkernel/intern/unit.c
M source/blender/blenloader/intern/readfile.c
M source/blender/bmesh/intern/bmesh_interp.c
M source/blender/bmesh/operators/bmo_hull.c
M source/blender/bmesh/operators/bmo_smooth_laplacian.c
M source/blender/editors/animation/anim_channels_edit.c
M source/blender/editors/curve/editcurve.c
M source/blender/editors/mask/mask_ops.c
M source/blender/editors/physics/particle_edit.c
M source/blender/editors/physics/physics_fluid.c
M source/blender/editors/screen/area.c
M source/blender/editors/screen/screen_ops.c
M source/blender/editors/sculpt_paint/sculpt.c
M source/blender/editors/space_clip/tracking_ops.c
M source/blender/editors/space_file/filelist.c
M source/blender/editors/space_info/info_stats.c
M source/blender/editors/space_node/node_buttons.c
M source/blender/editors/space_node/node_relationships.c
M source/blender/editors/space_sequencer/sequencer_edit.c
M source/blender/editors/transform/transform_generics.c
M source/blender/editors/uvedit/uvedit_smart_stitch.c
M source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
M source/blender/imbuf/intern/openexr/openexr_api.cpp
M source/blender/render/intern/raytrace/rayobject_octree.cpp
M source/blender/windowmanager/intern/wm_draw.c
M source/blender/windowmanager/intern/wm_event_system.c
M source/blender/windowmanager/intern/wm_keymap.c
===================================================================
diff --git a/source/blender/avi/intern/avi.c b/source/blender/avi/intern/avi.c
index 7bfe84e..a423c87 100644
--- a/source/blender/avi/intern/avi.c
+++ b/source/blender/avi/intern/avi.c
@@ -141,7 +141,7 @@ static int fcc_get_stream(int fcc)
return 10 * (fccs[0] - '0') + (fccs[1] - '0');
}
-static int fcc_is_data(int fcc)
+static bool fcc_is_data(int fcc)
{
char fccs[4];
diff --git a/source/blender/blenkernel/BKE_dynamicpaint.h b/source/blender/blenkernel/BKE_dynamicpaint.h
index 579da19..a8e152f 100644
--- a/source/blender/blenkernel/BKE_dynamicpaint.h
+++ b/source/blender/blenkernel/BKE_dynamicpaint.h
@@ -68,10 +68,10 @@ struct DerivedMesh *dynamicPaint_Modifier_do(struct DynamicPaintModifierData *pm
void dynamicPaint_Modifier_free(struct DynamicPaintModifierData *pmd);
void dynamicPaint_Modifier_copy(struct DynamicPaintModifierData *pmd, struct DynamicPaintModifierData *tsmd);
-int dynamicPaint_createType(struct DynamicPaintModifierData *pmd, int type, struct Scene *scene);
+bool dynamicPaint_createType(struct DynamicPaintModifierData *pmd, int type, struct Scene *scene);
struct DynamicPaintSurface *dynamicPaint_createNewSurface(struct DynamicPaintCanvasSettings *canvas, struct Scene *scene);
void dynamicPaint_clearSurface(struct Scene *scene, struct DynamicPaintSurface *surface);
-int dynamicPaint_resetSurface(struct Scene *scene, struct DynamicPaintSurface *surface);
+bool dynamicPaint_resetSurface(struct Scene *scene, struct DynamicPaintSurface *surface);
void dynamicPaint_freeSurface(struct DynamicPaintSurface *surface);
void dynamicPaint_freeCanvas(struct DynamicPaintModifierData *pmd);
void dynamicPaint_freeBrush(struct DynamicPaintModifierData *pmd);
diff --git a/source/blender/blenkernel/BKE_lattice.h b/source/blender/blenkernel/BKE_lattice.h
index ba45df7..c7e9fe5 100644
--- a/source/blender/blenkernel/BKE_lattice.h
+++ b/source/blender/blenkernel/BKE_lattice.h
@@ -58,7 +58,7 @@ __attribute__((warn_unused_result))
void calc_latt_deform(struct LatticeDeformData *lattice_deform_data, float co[3], float weight);
void end_latt_deform(struct LatticeDeformData *lattice_deform_data);
-int object_deform_mball(struct Object *ob, struct ListBase *dispbase);
+bool object_deform_mball(struct Object *ob, struct ListBase *dispbase);
void outside_lattice(struct Lattice *lt);
void curve_deform_verts(struct Object *cuOb, struct Object *target,
diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c
index 1ccef2b..e5565e8 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -1282,7 +1282,7 @@ void CustomData_update_typemap(CustomData *data)
/* currently only used in BLI_assert */
#ifndef NDEBUG
-static int customdata_typemap_is_valid(const CustomData *data)
+static bool customdata_typemap_is_valid(const CustomData *data)
{
CustomData data_copy = *data;
CustomData_update_typemap(&data_copy);
diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c
index 98cac2f..817b81a 100644
--- a/source/blender/blenkernel/intern/dynamicpaint.c
+++ b/source/blender/blenkernel/intern/dynamicpaint.c
@@ -1101,7 +1101,7 @@ DynamicPaintSurface *dynamicPaint_createNewSurface(DynamicPaintCanvasSettings *c
/*
* Initialize modifier data
*/
-int dynamicPaint_createType(struct DynamicPaintModifierData *pmd, int type, struct Scene *scene)
+bool dynamicPaint_createType(struct DynamicPaintModifierData *pmd, int type, struct Scene *scene)
{
if (pmd) {
if (type == MOD_DYNAMICPAINT_TYPE_CANVAS) {
@@ -1628,7 +1628,7 @@ void dynamicPaint_clearSurface(Scene *scene, DynamicPaintSurface *surface)
}
/* completely (re)initializes surface (only for point cache types)*/
-int dynamicPaint_resetSurface(Scene *scene, DynamicPaintSurface *surface)
+bool dynamicPaint_resetSurface(Scene *scene, DynamicPaintSurface *surface)
{
int numOfPoints = dynamicPaint_surfaceNumOfPoints(surface);
/* free existing data */
@@ -1655,7 +1655,7 @@ int dynamicPaint_resetSurface(Scene *scene, DynamicPaintSurface *surface)
}
/* make sure allocated surface size matches current requirements */
-static int dynamicPaint_checkSurfaceData(Scene *scene, DynamicPaintSurface *surface)
+static bool dynamicPaint_checkSurfaceData(Scene *scene, DynamicPaintSurface *surface)
{
if (!surface->data || ((dynamicPaint_surfaceNumOfPoints(surface) != surface->data->total_points))) {
return dynamicPaint_resetSurface(scene, surface);
diff --git a/source/blender/blenkernel/intern/editderivedmesh.c b/source/blender/blenkernel/intern/editderivedmesh.c
index c3538b1..308838c 100644
--- a/source/blender/blenkernel/intern/editderivedmesh.c
+++ b/source/blender/blenkernel/intern/editderivedmesh.c
@@ -1205,7 +1205,7 @@ static int emDM_getNumPolys(DerivedMesh *dm)
return bmdm->em->bm->totface;
}
-static int bmvert_to_mvert(BMesh *bm, BMVert *ev, MVert *r_vert)
+static void bmvert_to_mvert(BMesh *bm, BMVert *ev, MVert *r_vert)
{
float *f;
@@ -1218,8 +1218,6 @@ static int bmvert_to_mvert(BMesh *bm, BMVert *ev, MVert *r_vert)
if ((f = CustomData_bmesh_get(&bm->vdata, ev->head.data, CD_BWEIGHT))) {
r_vert->bweight = (unsigned char)((*f) * 255.0f);
}
-
- return 1;
}
static void emDM_getVert(DerivedMesh *dm, int index, MVert *r_vert)
diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c
index dfab5a0..f7d3945 100644
--- a/source/blender/blenkernel/intern/lattice.c
+++ b/source/blender/blenkernel/intern/lattice.c
@@ -563,7 +563,7 @@ static void init_curve_deform(Object *par, Object *ob, CurveDeform *cd)
*
* returns OK: 1/0
*/
-static int where_on_path_deform(Object *ob, float ctime, float vec[4], float dir[3], float quat[4], float *radius)
+static bool where_on_path_deform(Object *ob, float ctime, float vec[4], float dir[3], float quat[4], float *radius)
{
BevList *bl;
float ctime1;
@@ -614,8 +614,8 @@ static int where_on_path_deform(Object *ob, float ctime, float vec[4], float dir
/* co: local coord, result local too */
/* returns quaternion for rotation, using cd->no_rot_axis */
/* axis is using another define!!! */
-static int calc_curve_deform(Object *par, float co[3],
- const short axis, CurveDeform *cd, float quat_r[4])
+static bool calc_curve_deform(Object *par, float co[3],
+ const short axis, CurveDeform *cd, float quat_r[4])
{
Curve *cu = par->data;
float fac, loc[4], dir[3], new_quat[4], radius;
@@ -921,7 +921,7 @@ void lattice_deform_verts(Object *laOb, Object *target, DerivedMesh *dm,
end_latt_deform(lattice_deform_data);
}
-int object_deform_mball(Object *ob, ListBase *dispbase)
+bool object_deform_mball(Object *ob, ListBase *dispbase)
{
if (ob->parent && ob->parent->type == OB_LATTICE && ob->partype == PARSKEL) {
DispList *dl;
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c
index e91b1c5..1cae95e 100644
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@ -1113,7 +1113,7 @@ void end_render_materials(Main *bmain)
end_render_material(ma);
}
-static int material_in_nodetree(bNodeTree *ntree, Material *mat)
+static bool material_in_nodetree(bNodeTree *ntree, Material *mat)
{
bNode *node;
diff --git a/source/blender/blenkernel/intern/nla.c b/source/blender/blenkernel/intern/nla.c
index b2b20f8..5679675 100644
--- a/source/blender/blenkernel/intern/nla.c
+++ b/source/blender/blenkernel/intern/nla.c
@@ -1189,7 +1189,7 @@ void BKE_nlastrip_recalculate_bounds(NlaStrip *strip)
/* Is the given NLA-strip the first one to occur for the given AnimData block */
// TODO: make this an api method if necesary, but need to add prefix first
-static short nlastrip_is_first(AnimData *adt, NlaStrip *strip)
+static bool nlastrip_is_first(AnimData *adt, NlaStrip *strip)
{
NlaTrack *nlt;
NlaStrip *ns;
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 1c49849..9ed76c5 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -2292,7 +2292,7 @@ static void solve_parenting(Scene *scene, Object *ob, Object *par, float obmat[4
}
}
-static int where_is_object_parslow(Object *ob, float obmat[4][4], float slowmat[4][4])
+static bool where_is_object_parslow(Object *ob, float obmat[4][4], float slowmat[4][4])
{
float *fp1, *fp2;
float fac1, fac2;
diff --git a/source/blender/blenkernel/intern/pbvh_bmesh.c b/source/blender/blenkernel/intern/pbvh_bmesh.c
index 3596ad9..0176d20 100644
--- a/source/blender/blenkernel/intern/pbvh_bmesh.c
+++ b/source/blender/blenkernel/intern/pbvh_bmesh.c
@@ -494,7 +494,7 @@ typedef struct {
int cd_vert_mask_offset;
} EdgeQueueContext;
-static int edge_queue_tri_in_sphere(const EdgeQueue *q, BMFace *f)
+static bool edge_queue_tri_in_sphere(const EdgeQueue *q, BMFace *f)
{
BMVert *v_tri[3];
float c[3];
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index 58d4a2a..675c7dc 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -1185,7 +1185,7 @@ int BKE_sequencer_evaluate_frame(Scene *scene, int cfra)
return evaluate_seq_frame_gen(seq_arr, ed->seqbasep, cfra);
}
-static int video_seq_is_rendered(Sequence *seq)
+static bool video_seq_is_rendered(Sequence *seq)
{
return (seq && !(seq->flag & SEQ_MUTE) && seq->type != SEQ_TYPE_SOUND_RAM);
}
@@ -2815,9 +2815,9 @@ static ImBuf *seq_render_strip(const SeqRenderData *context, Sequence *seq, floa
/*********************** strip stack rendering functions *************************/
-static int seq_must_swap_input_in_blend_mode(Sequence *seq)
+static bool seq_must_swap_input_in_blend_mode(Sequence *seq)
{
- int swap_input = FALSE;
+ bool swap_input = FALSE;
/* bad hack, to fix crazy input ordering of
* those two effects */
diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c
index 7fea20a..829354c 100644
--- a/sour
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list