Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2013-06-02 07:59:19 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-06-02 07:59:19 +0400
commite648ca8862a2cee3723450b67f556e222b8b0d6b (patch)
tree2750fcc166057bd65a72d86964d394a800562c4c /source/blender/modifiers/intern/MOD_displace.c
parent7ce0ea00a01a3d6d409c8d5182d068a480c6c7d4 (diff)
use booleans for modifiers and api callbacks.
Diffstat (limited to 'source/blender/modifiers/intern/MOD_displace.c')
-rw-r--r--source/blender/modifiers/intern/MOD_displace.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/modifiers/intern/MOD_displace.c b/source/blender/modifiers/intern/MOD_displace.c
index 988d15e8df4..d8e2647426c 100644
--- a/source/blender/modifiers/intern/MOD_displace.c
+++ b/source/blender/modifiers/intern/MOD_displace.c
@@ -95,7 +95,7 @@ static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md)
return dataMask;
}
-static int dependsOnTime(ModifierData *md)
+static bool dependsOnTime(ModifierData *md)
{
DisplaceModifierData *dmd = (DisplaceModifierData *)md;
@@ -103,11 +103,11 @@ static int dependsOnTime(ModifierData *md)
return BKE_texture_dependsOnTime(dmd->texture);
}
else {
- return 0;
+ return false;
}
}
-static int dependsOnNormals(ModifierData *md)
+static bool dependsOnNormals(ModifierData *md)
{
DisplaceModifierData *dmd = (DisplaceModifierData *)md;
return (dmd->direction == MOD_DISP_DIR_NOR);
@@ -137,7 +137,7 @@ static void foreachTexLink(ModifierData *md, Object *ob,
walk(userData, ob, md, "texture");
}
-static int isDisabled(ModifierData *md, int UNUSED(useRenderParams))
+static bool isDisabled(ModifierData *md, int UNUSED(useRenderParams))
{
DisplaceModifierData *dmd = (DisplaceModifierData *) md;
return ((!dmd->texture && dmd->direction == MOD_DISP_DIR_RGB_XYZ) || dmd->strength == 0.0f);