diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-06-02 07:59:19 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-06-02 07:59:19 +0400 |
commit | e648ca8862a2cee3723450b67f556e222b8b0d6b (patch) | |
tree | 2750fcc166057bd65a72d86964d394a800562c4c /source/blender/blenkernel | |
parent | 7ce0ea00a01a3d6d409c8d5182d068a480c6c7d4 (diff) |
use booleans for modifiers and api callbacks.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_modifier.h | 36 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_texture.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/modifier.c | 48 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/texture.c | 4 |
4 files changed, 45 insertions, 45 deletions
diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h index 955df65d00d..e466964c73f 100644 --- a/source/blender/blenkernel/BKE_modifier.h +++ b/source/blender/blenkernel/BKE_modifier.h @@ -248,7 +248,7 @@ typedef struct ModifierTypeInfo { * * This function is optional (assumes never disabled if not present). */ - int (*isDisabled)(struct ModifierData *md, int userRenderParams); + bool (*isDisabled)(struct ModifierData *md, int userRenderParams); /* Add the appropriate relations to the DEP graph depending on the * modifier data. @@ -263,7 +263,7 @@ typedef struct ModifierTypeInfo { * * This function is optional (assumes false if not present). */ - int (*dependsOnTime)(struct ModifierData *md); + bool (*dependsOnTime)(struct ModifierData *md); /* True when a deform modifier uses normals, the requiredDataMask @@ -273,7 +273,7 @@ typedef struct ModifierTypeInfo { * this is needed because applying 2 deform modifiers will give the * second modifier bogus normals. * */ - int (*dependsOnNormals)(struct ModifierData *md); + bool (*dependsOnNormals)(struct ModifierData *md); /* Should call the given walk function on with a pointer to each Object @@ -318,19 +318,19 @@ void modifier_free(struct ModifierData *md); void modifier_unique_name(struct ListBase *modifiers, struct ModifierData *md); void modifier_copyData(struct ModifierData *md, struct ModifierData *target); -int modifier_dependsOnTime(struct ModifierData *md); -int modifier_supportsMapping(struct ModifierData *md); -int modifier_couldBeCage(struct Scene *scene, struct ModifierData *md); -int modifier_isCorrectableDeformed(struct ModifierData *md); -int modifier_isSameTopology(ModifierData *md); -int modifier_isNonGeometrical(ModifierData *md); -int modifier_isEnabled(struct Scene *scene, struct ModifierData *md, int required_mode); +bool modifier_dependsOnTime(struct ModifierData *md); +bool modifier_supportsMapping(struct ModifierData *md); +bool modifier_couldBeCage(struct Scene *scene, struct ModifierData *md); +bool modifier_isCorrectableDeformed(struct ModifierData *md); +bool modifier_isSameTopology(ModifierData *md); +bool modifier_isNonGeometrical(ModifierData *md); +bool modifier_isEnabled(struct Scene *scene, struct ModifierData *md, int required_mode); void modifier_setError(struct ModifierData *md, const char *format, ...) #ifdef __GNUC__ __attribute__ ((format(printf, 2, 3))) #endif ; -int modifier_isPreview(struct ModifierData *md); +bool modifier_isPreview(struct ModifierData *md); void modifiers_foreachObjectLink(struct Object *ob, ObjectWalkFunc walk, @@ -348,18 +348,18 @@ void modifiers_clearErrors(struct Object *ob); int modifiers_getCageIndex(struct Scene *scene, struct Object *ob, int *lastPossibleCageIndex_r, int virtual_); -int modifiers_isModifierEnabled(struct Object *ob, int modifierType); -int modifiers_isSoftbodyEnabled(struct Object *ob); -int modifiers_isClothEnabled(struct Object *ob); -int modifiers_isParticleEnabled(struct Object *ob); +bool modifiers_isModifierEnabled(struct Object *ob, int modifierType); +bool modifiers_isSoftbodyEnabled(struct Object *ob); +bool modifiers_isClothEnabled(struct Object *ob); +bool modifiers_isParticleEnabled(struct Object *ob); struct Object *modifiers_isDeformedByArmature(struct Object *ob); struct Object *modifiers_isDeformedByLattice(struct Object *ob); struct Object *modifiers_isDeformedByCurve(struct Object *ob); -int modifiers_usesArmature(struct Object *ob, struct bArmature *arm); -int modifiers_isCorrectableDeformed(struct Object *ob); +bool modifiers_usesArmature(struct Object *ob, struct bArmature *arm); +bool modifiers_isCorrectableDeformed(struct Object *ob); void modifier_freeTemporaryData(struct ModifierData *md); -int modifiers_isPreview(struct Object *ob); +bool modifiers_isPreview(struct Object *ob); typedef struct CDMaskLink { struct CDMaskLink *next; diff --git a/source/blender/blenkernel/BKE_texture.h b/source/blender/blenkernel/BKE_texture.h index 23a6a96c75c..ac0d507003e 100644 --- a/source/blender/blenkernel/BKE_texture.h +++ b/source/blender/blenkernel/BKE_texture.h @@ -127,7 +127,7 @@ void BKE_free_oceantex(struct OceanTex *ot); struct OceanTex *BKE_add_oceantex(void); struct OceanTex *BKE_copy_oceantex(struct OceanTex *ot); -int BKE_texture_dependsOnTime(const struct Tex *texture); +bool BKE_texture_dependsOnTime(const struct Tex *texture); #ifdef __cplusplus } diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c index dda243eed5c..1ebe99eb660 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -127,14 +127,14 @@ void modifier_unique_name(ListBase *modifiers, ModifierData *md) } } -int modifier_dependsOnTime(ModifierData *md) +bool modifier_dependsOnTime(ModifierData *md) { ModifierTypeInfo *mti = modifierType_getInfo(md->type); return mti->dependsOnTime && mti->dependsOnTime(md); } -int modifier_supportsMapping(ModifierData *md) +bool modifier_supportsMapping(ModifierData *md) { ModifierTypeInfo *mti = modifierType_getInfo(md->type); @@ -142,7 +142,7 @@ int modifier_supportsMapping(ModifierData *md) (mti->flags & eModifierTypeFlag_SupportsMapping)); } -int modifier_isPreview(ModifierData *md) +bool modifier_isPreview(ModifierData *md) { ModifierTypeInfo *mti = modifierType_getInfo(md->type); @@ -237,7 +237,7 @@ void modifier_copyData(ModifierData *md, ModifierData *target) mti->copyData(md, target); } -int modifier_couldBeCage(struct Scene *scene, ModifierData *md) +bool modifier_couldBeCage(struct Scene *scene, ModifierData *md) { ModifierTypeInfo *mti = modifierType_getInfo(md->type); @@ -249,13 +249,13 @@ int modifier_couldBeCage(struct Scene *scene, ModifierData *md) modifier_supportsMapping(md)); } -int modifier_isSameTopology(ModifierData *md) +bool modifier_isSameTopology(ModifierData *md) { ModifierTypeInfo *mti = modifierType_getInfo(md->type); return ELEM(mti->type, eModifierTypeType_OnlyDeform, eModifierTypeType_NonGeometrical); } -int modifier_isNonGeometrical(ModifierData *md) +bool modifier_isNonGeometrical(ModifierData *md) { ModifierTypeInfo *mti = modifierType_getInfo(md->type); return (mti->type == eModifierTypeType_NonGeometrical); @@ -320,35 +320,35 @@ int modifiers_getCageIndex(struct Scene *scene, Object *ob, int *lastPossibleCag } -int modifiers_isSoftbodyEnabled(Object *ob) +bool modifiers_isSoftbodyEnabled(Object *ob) { ModifierData *md = modifiers_findByType(ob, eModifierType_Softbody); return (md && md->mode & (eModifierMode_Realtime | eModifierMode_Render)); } -int modifiers_isClothEnabled(Object *ob) +bool modifiers_isClothEnabled(Object *ob) { ModifierData *md = modifiers_findByType(ob, eModifierType_Cloth); return (md && md->mode & (eModifierMode_Realtime | eModifierMode_Render)); } -int modifiers_isModifierEnabled(Object *ob, int modifierType) +bool modifiers_isModifierEnabled(Object *ob, int modifierType) { ModifierData *md = modifiers_findByType(ob, modifierType); return (md && md->mode & (eModifierMode_Realtime | eModifierMode_Render)); } -int modifiers_isParticleEnabled(Object *ob) +bool modifiers_isParticleEnabled(Object *ob) { ModifierData *md = modifiers_findByType(ob, eModifierType_ParticleSystem); return (md && md->mode & (eModifierMode_Realtime | eModifierMode_Render)); } -int modifier_isEnabled(struct Scene *scene, ModifierData *md, int required_mode) +bool modifier_isEnabled(struct Scene *scene, ModifierData *md, int required_mode) { ModifierTypeInfo *mti = modifierType_getInfo(md->type); @@ -569,7 +569,7 @@ Object *modifiers_isDeformedByCurve(Object *ob) return NULL; } -int modifiers_usesArmature(Object *ob, bArmature *arm) +bool modifiers_usesArmature(Object *ob, bArmature *arm) { ModifierData *md = modifiers_getVirtualModifierList(ob); @@ -577,24 +577,24 @@ int modifiers_usesArmature(Object *ob, bArmature *arm) if (md->type == eModifierType_Armature) { ArmatureModifierData *amd = (ArmatureModifierData *) md; if (amd->object && amd->object->data == arm) - return 1; + return true; } } - return 0; + return false; } -int modifier_isCorrectableDeformed(ModifierData *md) +bool modifier_isCorrectableDeformed(ModifierData *md) { if (md->type == eModifierType_Armature) - return 1; + return true; if (md->type == eModifierType_ShapeKey) - return 1; + return true; - return 0; + return false; } -int modifiers_isCorrectableDeformed(Object *ob) +bool modifiers_isCorrectableDeformed(Object *ob) { ModifierData *md = modifiers_getVirtualModifierList(ob); @@ -603,24 +603,24 @@ int modifiers_isCorrectableDeformed(Object *ob) /* pass */ } else if (modifier_isCorrectableDeformed(md)) { - return 1; + return true; } } - return 0; + return false; } /* Check whether the given object has a modifier in its stack that uses WEIGHT_MCOL CD layer * to preview something... Used by DynamicPaint and WeightVG currently. */ -int modifiers_isPreview(Object *ob) +bool modifiers_isPreview(Object *ob) { ModifierData *md = ob->modifiers.first; for (; md; md = md->next) { if (modifier_isPreview(md)) - return TRUE; + return true; } - return FALSE; + return false; } void modifier_freeTemporaryData(ModifierData *md) diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c index 10b0e14d517..1d0b0deae7e 100644 --- a/source/blender/blenkernel/intern/texture.c +++ b/source/blender/blenkernel/intern/texture.c @@ -1420,10 +1420,10 @@ void BKE_free_oceantex(struct OceanTex *ot) /* ------------------------------------------------------------------------- */ -int BKE_texture_dependsOnTime(const struct Tex *texture) +bool BKE_texture_dependsOnTime(const struct Tex *texture) { if (texture->ima && - ELEM(texture->ima->source, IMA_SRC_SEQUENCE, IMA_SRC_MOVIE)) + ELEM(texture->ima->source, IMA_SRC_SEQUENCE, IMA_SRC_MOVIE)) { return 1; } |