[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57187] trunk/blender/source/blender: use booleans for modifiers and api callbacks.
Campbell Barton
ideasman42 at gmail.com
Sun Jun 2 05:59:20 CEST 2013
Revision: 57187
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57187
Author: campbellbarton
Date: 2013-06-02 03:59:19 +0000 (Sun, 02 Jun 2013)
Log Message:
-----------
use booleans for modifiers and api callbacks.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_modifier.h
trunk/blender/source/blender/blenkernel/BKE_texture.h
trunk/blender/source/blender/blenkernel/intern/modifier.c
trunk/blender/source/blender/blenkernel/intern/texture.c
trunk/blender/source/blender/modifiers/intern/MOD_armature.c
trunk/blender/source/blender/modifiers/intern/MOD_boolean.c
trunk/blender/source/blender/modifiers/intern/MOD_build.c
trunk/blender/source/blender/modifiers/intern/MOD_cast.c
trunk/blender/source/blender/modifiers/intern/MOD_cloth.c
trunk/blender/source/blender/modifiers/intern/MOD_collision.c
trunk/blender/source/blender/modifiers/intern/MOD_curve.c
trunk/blender/source/blender/modifiers/intern/MOD_displace.c
trunk/blender/source/blender/modifiers/intern/MOD_dynamicpaint.c
trunk/blender/source/blender/modifiers/intern/MOD_explode.c
trunk/blender/source/blender/modifiers/intern/MOD_fluidsim.c
trunk/blender/source/blender/modifiers/intern/MOD_hook.c
trunk/blender/source/blender/modifiers/intern/MOD_laplaciansmooth.c
trunk/blender/source/blender/modifiers/intern/MOD_lattice.c
trunk/blender/source/blender/modifiers/intern/MOD_meshcache.c
trunk/blender/source/blender/modifiers/intern/MOD_meshdeform.c
trunk/blender/source/blender/modifiers/intern/MOD_none.c
trunk/blender/source/blender/modifiers/intern/MOD_particleinstance.c
trunk/blender/source/blender/modifiers/intern/MOD_screw.c
trunk/blender/source/blender/modifiers/intern/MOD_shrinkwrap.c
trunk/blender/source/blender/modifiers/intern/MOD_smoke.c
trunk/blender/source/blender/modifiers/intern/MOD_smooth.c
trunk/blender/source/blender/modifiers/intern/MOD_softbody.c
trunk/blender/source/blender/modifiers/intern/MOD_subsurf.c
trunk/blender/source/blender/modifiers/intern/MOD_surface.c
trunk/blender/source/blender/modifiers/intern/MOD_warp.c
trunk/blender/source/blender/modifiers/intern/MOD_wave.c
trunk/blender/source/blender/modifiers/intern/MOD_weightvgedit.c
trunk/blender/source/blender/modifiers/intern/MOD_weightvgmix.c
trunk/blender/source/blender/modifiers/intern/MOD_weightvgproximity.c
Modified: trunk/blender/source/blender/blenkernel/BKE_modifier.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_modifier.h 2013-06-02 02:25:40 UTC (rev 57186)
+++ trunk/blender/source/blender/blenkernel/BKE_modifier.h 2013-06-02 03:59:19 UTC (rev 57187)
@@ -248,7 +248,7 @@
*
* 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 @@
*
* 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 @@
* 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_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 @@
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;
Modified: trunk/blender/source/blender/blenkernel/BKE_texture.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_texture.h 2013-06-02 02:25:40 UTC (rev 57186)
+++ trunk/blender/source/blender/blenkernel/BKE_texture.h 2013-06-02 03:59:19 UTC (rev 57187)
@@ -127,7 +127,7 @@
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
}
Modified: trunk/blender/source/blender/blenkernel/intern/modifier.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/modifier.c 2013-06-02 02:25:40 UTC (rev 57186)
+++ trunk/blender/source/blender/blenkernel/intern/modifier.c 2013-06-02 03:59:19 UTC (rev 57187)
@@ -127,14 +127,14 @@
}
}
-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 @@
(mti->flags & eModifierTypeFlag_SupportsMapping));
}
-int modifier_isPreview(ModifierData *md)
+bool modifier_isPreview(ModifierData *md)
{
ModifierTypeInfo *mti = modifierType_getInfo(md->type);
@@ -237,7 +237,7 @@
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 @@
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_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 @@
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 @@
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 @@
/* 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)
Modified: trunk/blender/source/blender/blenkernel/intern/texture.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/texture.c 2013-06-02 02:25:40 UTC (rev 57186)
+++ trunk/blender/source/blender/blenkernel/intern/texture.c 2013-06-02 03:59:19 UTC (rev 57187)
@@ -1420,10 +1420,10 @@
/* ------------------------------------------------------------------------- */
-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;
}
Modified: trunk/blender/source/blender/modifiers/intern/MOD_armature.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_armature.c 2013-06-02 02:25:40 UTC (rev 57186)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list