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>2012-06-17 13:58:26 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-06-17 13:58:26 +0400
commitf5f25b81e8963aeba0a4c09f09358de070e0f927 (patch)
treec7fd6345d3a372845a0621e90087f88c90e4b8b8 /source/blender/render
parent245c94a75e60c2c0b58c1f39d189258e2e424e29 (diff)
style cleanup:
also fix for building ghost test and fix double free in one of the tests
Diffstat (limited to 'source/blender/render')
-rw-r--r--source/blender/render/intern/source/volumetric.c4
-rw-r--r--source/blender/render/intern/source/zbuf.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index e4c4e905aa6..c1f85914479 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -376,7 +376,7 @@ static float vol_get_phasefunc(ShadeInput *UNUSED(shi), float g, const float w[3
return normalize * 1.f;
}
else { /* schlick */
- const float k = 1.55f * g - .55f * g * g * g;
+ const float k = 1.55f * g - 0.55f * g * g * g;
const float kcostheta = k * dot_v3v3(w, wp);
return normalize * (1.f - k * k) / ((1.f - kcostheta) * (1.f - kcostheta));
}
@@ -394,7 +394,7 @@ static float vol_get_phasefunc(ShadeInput *UNUSED(shi), float g, const float w[3
return normalize * (1.f - g * g) / powf(1.f + g * g - 2.f * g * costheta, 1.5f);
case MA_VOL_PH_SCHLICK:
{
- const float k = 1.55f * g - .55f * g * g * g;
+ const float k = 1.55f * g - 0.55f * g * g * g;
const float kcostheta = k * costheta;
return normalize * (1.f - k * k) / ((1.f - kcostheta) * (1.f - kcostheta));
}
diff --git a/source/blender/render/intern/source/zbuf.c b/source/blender/render/intern/source/zbuf.c
index ecde9bb2de8..c88858c44da 100644
--- a/source/blender/render/intern/source/zbuf.c
+++ b/source/blender/render/intern/source/zbuf.c
@@ -2858,7 +2858,7 @@ static void quad_bezier_2d(float *result, float *v1, float *v2, float *ipodata)
p1[0]= v1[0];
p1[1]= v1[1];
- /* official formula 2*p2 - .5*p1 - .5*p3 */
+ /* official formula 2*p2 - 0.5*p1 - 0.5*p3 */
p2[0]= -0.5f*p1[0] - 0.5f*p3[0];
p2[1]= -0.5f*p1[1] - 0.5f*p3[1];