From a5c35fb27f090bb716a3bb49a69a56be80dff6d3 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 28 Jan 2014 03:52:21 +1100 Subject: Code cleanup: use booleans where appropriate --- source/blender/blenkernel/BKE_material.h | 2 +- source/blender/blenkernel/BKE_node.h | 8 ++--- source/blender/blenkernel/BKE_texture.h | 2 +- source/blender/blenkernel/BKE_world.h | 2 +- source/blender/blenkernel/intern/DerivedMesh.c | 41 +++++++++++++------------- source/blender/blenkernel/intern/anim_sys.c | 2 +- source/blender/blenkernel/intern/material.c | 2 +- source/blender/blenkernel/intern/node.c | 12 ++++---- source/blender/blenkernel/intern/texture.c | 2 +- source/blender/blenkernel/intern/world.c | 2 +- 10 files changed, 37 insertions(+), 38 deletions(-) (limited to 'source/blender/blenkernel') diff --git a/source/blender/blenkernel/BKE_material.h b/source/blender/blenkernel/BKE_material.h index e2d49aa51ff..c866fbb7b13 100644 --- a/source/blender/blenkernel/BKE_material.h +++ b/source/blender/blenkernel/BKE_material.h @@ -48,7 +48,7 @@ struct Scene; void init_def_material(void); void BKE_material_free(struct Material *sc); -void BKE_material_free_ex(struct Material *ma, int do_id_user); +void BKE_material_free_ex(struct Material *ma, bool do_id_user); void test_object_materials(struct Main *bmain, struct ID *id); void BKE_material_resize_object(struct Object *ob, const short totcol, bool do_id_user); void init_material(struct Material *ma); diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index fc0359d8ff0..664c1a6b051 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -339,11 +339,11 @@ void ntreeSetTypes(const struct bContext *C, struct bNodeTree *ntree); struct bNodeTree *ntreeAddTree(struct Main *bmain, const char *name, const char *idname); /* copy/free funcs, need to manage ID users */ -void ntreeFreeTree_ex(struct bNodeTree *ntree, const short do_id_user); +void ntreeFreeTree_ex(struct bNodeTree *ntree, const bool do_id_user); void ntreeFreeTree(struct bNodeTree *ntree); -struct bNodeTree *ntreeCopyTree_ex(struct bNodeTree *ntree, const short do_id_user); +struct bNodeTree *ntreeCopyTree_ex(struct bNodeTree *ntree, const bool do_id_user); struct bNodeTree *ntreeCopyTree(struct bNodeTree *ntree); -void ntreeSwitchID_ex(struct bNodeTree *ntree, struct ID *sce_from, struct ID *sce_to, const short do_id_user); +void ntreeSwitchID_ex(struct bNodeTree *ntree, struct ID *sce_from, struct ID *sce_to, const bool do_id_user); void ntreeSwitchID(struct bNodeTree *ntree, struct ID *sce_from, struct ID *sce_to); /* node->id user count */ void ntreeUserIncrefID(struct bNodeTree *ntree); @@ -488,7 +488,7 @@ int nodeSocketIsHidden(struct bNodeSocket *sock); /* Node Clipboard */ void BKE_node_clipboard_init(struct bNodeTree *ntree); void BKE_node_clipboard_clear(void); -int BKE_node_clipboard_validate(void); +bool BKE_node_clipboard_validate(void); void BKE_node_clipboard_add_node(struct bNode *node); void BKE_node_clipboard_add_link(struct bNodeLink *link); const struct ListBase *BKE_node_clipboard_get_nodes(void); diff --git a/source/blender/blenkernel/BKE_texture.h b/source/blender/blenkernel/BKE_texture.h index e9e351f8f37..cf192234906 100644 --- a/source/blender/blenkernel/BKE_texture.h +++ b/source/blender/blenkernel/BKE_texture.h @@ -100,7 +100,7 @@ void set_current_material_texture(struct Material *ma, struct Tex *tex); void set_current_lamp_texture(struct Lamp *la, struct Tex *tex); void set_current_particle_texture(struct ParticleSettings *part, struct Tex *tex); -int has_current_material_texture(struct Material *ma); +bool has_current_material_texture(struct Material *ma); struct TexMapping *add_tex_mapping(int type); void default_tex_mapping(struct TexMapping *texmap, int type); diff --git a/source/blender/blenkernel/BKE_world.h b/source/blender/blenkernel/BKE_world.h index 6bb35e46539..7f4ba6c615e 100644 --- a/source/blender/blenkernel/BKE_world.h +++ b/source/blender/blenkernel/BKE_world.h @@ -37,7 +37,7 @@ struct Main; struct World; void BKE_world_free(struct World *sc); -void BKE_world_free_ex(struct World *sc, int do_id_user); +void BKE_world_free_ex(struct World *sc, bool do_id_user); struct World *add_world(struct Main *bmian, const char *name); struct World *BKE_world_copy(struct World *wrld); struct World *localize_world(struct World *wrld); diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index cc0e80c81e9..83e0d99bc6b 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -1429,20 +1429,21 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos DerivedMesh *dm = NULL, *orcodm, *clothorcodm, *finaldm; int numVerts = me->totvert; int required_mode; - int isPrevDeform = FALSE; - int skipVirtualArmature = (useDeform < 0); + bool isPrevDeform = false; + const bool skipVirtualArmature = (useDeform < 0); MultiresModifierData *mmd = get_multires_modifier(scene, ob, 0); - int has_multires = mmd != NULL, multires_applied = 0; - int sculpt_mode = ob->mode & OB_MODE_SCULPT && ob->sculpt; - int sculpt_dyntopo = (sculpt_mode && ob->sculpt->bm); - int draw_flag = dm_drawflag_calc(scene->toolsettings); + const bool has_multires = (mmd && mmd->sculptlvl != 0); + bool multires_applied = false; + const bool sculpt_mode = ob->mode & OB_MODE_SCULPT && ob->sculpt; + const bool sculpt_dyntopo = (sculpt_mode && ob->sculpt->bm); + const int draw_flag = dm_drawflag_calc(scene->toolsettings); /* Generic preview only in object mode! */ - const int do_mod_mcol = (ob->mode == OB_MODE_OBJECT); + const bool do_mod_mcol = (ob->mode == OB_MODE_OBJECT); #if 0 /* XXX Will re-enable this when we have global mod stack options. */ - const int do_final_wmcol = (scene->toolsettings->weights_preview == WP_WPREVIEW_FINAL) && do_wmcol; + const bool do_final_wmcol = (scene->toolsettings->weights_preview == WP_WPREVIEW_FINAL) && do_wmcol; #endif - const int do_final_wmcol = FALSE; + const bool do_final_wmcol = FALSE; int do_init_wmcol = ((dataMask & CD_MASK_PREVIEW_MCOL) && (ob->mode & OB_MODE_WEIGHT_PAINT) && !do_final_wmcol); /* XXX Same as above... For now, only weights preview in WPaint mode. */ const int do_mod_wmcol = do_init_wmcol; @@ -1456,9 +1457,6 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos if (useDeform) deform_app_flags |= MOD_APPLY_USECACHE; - if (mmd && !mmd->sculptlvl) - has_multires = 0; - if (!skipVirtualArmature) { firstmd = modifiers_getVirtualModifierList(ob, &virtualModifierData); } @@ -1570,7 +1568,7 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos if (sculpt_mode && (!has_multires || multires_applied || ob->sculpt->bm)) { - int unsupported = 0; + bool unsupported = false; if (md->type == eModifierType_Multires && ((MultiresModifierData *)md)->sculptlvl == 0) { /* If multires is on level 0 skip it silently without warning message. */ @@ -1578,10 +1576,10 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos } if (sculpt_dyntopo && !useRenderParams) - unsupported = TRUE; + unsupported = true; if (scene->toolsettings->sculpt->flags & SCULPT_ONLY_DEFORM) - unsupported |= mti->type != eModifierTypeType_OnlyDeform; + unsupported |= (mti->type != eModifierTypeType_OnlyDeform); unsupported |= multires_applied; @@ -1786,8 +1784,9 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos if ((index >= 0) && (BLI_findindex(&ob->modifiers, md) >= index)) break; - if (sculpt_mode && md->type == eModifierType_Multires) - multires_applied = 1; + if (sculpt_mode && md->type == eModifierType_Multires) { + multires_applied = true; + } } for (md = firstmd; md; md = md->next) @@ -1970,10 +1969,10 @@ static void editbmesh_calc_modifiers(Scene *scene, Object *ob, BMEditMesh *em, D #if 0 /* XXX Will re-enable this when we have global mod stack options. */ const int do_final_wmcol = (scene->toolsettings->weights_preview == WP_WPREVIEW_FINAL) && do_wmcol; #endif - const int do_final_wmcol = FALSE; - int do_init_wmcol = ((((Mesh *)ob->data)->drawflag & ME_DRAWEIGHT) && !do_final_wmcol); - int do_init_statvis = ((((Mesh *)ob->data)->drawflag & ME_DRAW_STATVIS) && !do_init_wmcol); - const int do_mod_wmcol = do_init_wmcol; + const bool do_final_wmcol = FALSE; + const bool do_init_wmcol = ((((Mesh *)ob->data)->drawflag & ME_DRAWEIGHT) && !do_final_wmcol); + const bool do_init_statvis = ((((Mesh *)ob->data)->drawflag & ME_DRAW_STATVIS) && !do_init_wmcol); + const bool do_mod_wmcol = do_init_wmcol; VirtualModifierData virtualModifierData; modifiers_clearErrors(ob); diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c index f20fa0c401d..a46b308f76b 100644 --- a/source/blender/blenkernel/intern/anim_sys.c +++ b/source/blender/blenkernel/intern/anim_sys.c @@ -2233,7 +2233,7 @@ static void animsys_evaluate_nla(ListBase *echannels, PointerRNA *ptr, AnimData { NlaTrack *nlt; short track_index = 0; - short has_strips = 0; + bool has_strips = false; ListBase estrips = {NULL, NULL}; NlaEvalStrip *nes; diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index 0c1bf476908..e91b1c5424a 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -84,7 +84,7 @@ void BKE_material_free(Material *ma) } /* not material itself */ -void BKE_material_free_ex(Material *ma, int do_id_user) +void BKE_material_free_ex(Material *ma, bool do_id_user) { MTex *mtex; int a; diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index 79f77416639..02751e0cbb3 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -1209,7 +1209,7 @@ static bNodeTree *ntreeCopyTree_internal(bNodeTree *ntree, Main *bmain, bool do_ return newtree; } -bNodeTree *ntreeCopyTree_ex(bNodeTree *ntree, const short do_id_user) +bNodeTree *ntreeCopyTree_ex(bNodeTree *ntree, const bool do_id_user) { return ntreeCopyTree_internal(ntree, G.main, do_id_user, TRUE, TRUE); } @@ -1219,7 +1219,7 @@ bNodeTree *ntreeCopyTree(bNodeTree *ntree) } /* use when duplicating scenes */ -void ntreeSwitchID_ex(bNodeTree *ntree, ID *id_from, ID *id_to, const short do_id_user) +void ntreeSwitchID_ex(bNodeTree *ntree, ID *id_from, ID *id_to, const bool do_id_user) { bNode *node; @@ -1702,7 +1702,7 @@ static void free_localized_node_groups(bNodeTree *ntree) } /* do not free ntree itself here, BKE_libblock_free calls this function too */ -void ntreeFreeTree_ex(bNodeTree *ntree, const short do_id_user) +void ntreeFreeTree_ex(bNodeTree *ntree, const bool do_id_user) { bNodeTree *tntree; bNode *node, *next; @@ -2552,9 +2552,9 @@ void BKE_node_clipboard_clear(void) } /* return FALSE when one or more ID's are lost */ -int BKE_node_clipboard_validate(void) +bool BKE_node_clipboard_validate(void) { - int ok = TRUE; + bool ok = true; #ifdef USE_NODE_CB_VALIDATE bNodeClipboardExtraInfo *node_info; @@ -2585,7 +2585,7 @@ int BKE_node_clipboard_validate(void) node->id = BLI_findstring(lb, node_info->id_name + 2, offsetof(ID, name) + 2); if (node->id == NULL) { - ok = FALSE; + ok = false; } } } diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c index a3ae6017706..786a490fa10 100644 --- a/source/blender/blenkernel/intern/texture.c +++ b/source/blender/blenkernel/intern/texture.c @@ -1121,7 +1121,7 @@ void set_current_material_texture(Material *ma, Tex *newtex) } } -int has_current_material_texture(Material *ma) +bool has_current_material_texture(Material *ma) { bNode *node; diff --git a/source/blender/blenkernel/intern/world.c b/source/blender/blenkernel/intern/world.c index a6c30ce0d3a..af8cf62484d 100644 --- a/source/blender/blenkernel/intern/world.c +++ b/source/blender/blenkernel/intern/world.c @@ -50,7 +50,7 @@ #include "BKE_node.h" #include "BKE_world.h" -void BKE_world_free_ex(World *wrld, int do_id_user) +void BKE_world_free_ex(World *wrld, bool do_id_user) { MTex *mtex; int a; -- cgit v1.2.3