[Bf-blender-cvs] [4273ec04be5] master: Cleanup: Add float format
Antonio Vazquez
noreply at git.blender.org
Wed Apr 28 17:11:02 CEST 2021
Commit: 4273ec04be5c4fcf5f9530cc01826c7566539781
Author: Antonio Vazquez
Date: Wed Apr 28 17:10:51 2021 +0200
Branches: master
https://developer.blender.org/rB4273ec04be5c4fcf5f9530cc01826c7566539781
Cleanup: Add float format
===================================================================
M source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c
===================================================================
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c
index 838e073115e..ea37558fa7f 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c
@@ -91,7 +91,7 @@ static float give_opacity_fading_factor(OpacityGpencilModifierData *mmd,
float *pos,
bool apply_obmat)
{
- float factor_depth = 1;
+ float factor_depth = 1.0f;
if (((mmd->flag & GP_OPACITY_FADING) == 0) || ((mmd->object) == NULL)) {
return factor_depth;
@@ -107,13 +107,13 @@ static float give_opacity_fading_factor(OpacityGpencilModifierData *mmd,
/* Better with ratiof() function from line art. */
if (dist > fading_max) {
- factor_depth = 0;
+ factor_depth = 0.0f;
}
else if (dist <= fading_max && dist > fading_min) {
factor_depth = (fading_max - dist) / (fading_max - fading_min);
}
else {
- factor_depth = 1;
+ factor_depth = 1.0f;
}
return factor_depth;
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c
index ee53fe2f168..512e3af063a 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c
@@ -131,7 +131,7 @@ static void deformStroke(GpencilModifierData *md,
float curvef = 1.0f;
- float factor_depth = 1;
+ float factor_depth = 1.0f;
if (mmd->flag & GP_THICK_FADING) {
if (mmd->object) {
@@ -143,13 +143,13 @@ static void deformStroke(GpencilModifierData *md,
/* Better with ratiof() function from line art. */
if (dist > fading_max) {
- factor_depth = 0;
+ factor_depth = 0.0f;
}
else if (dist <= fading_max && dist > fading_min) {
factor_depth = (fading_max - dist) / (fading_max - fading_min);
}
else {
- factor_depth = 1;
+ factor_depth = 1.0f;
}
}
}
More information about the Bf-blender-cvs
mailing list