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-11-18 06:41:55 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-11-18 06:41:55 +0400
commit973cb29d841a37f0c101cc20433329a83400d894 (patch)
treec512994e0a7ae379f044cfacc3e4ea939e438ba0 /source/blender/blenlib/intern/noise.c
parentb867f9f17eb1af2051749190aa6aee708972af82 (diff)
style cleanup: if's on the same line.
Diffstat (limited to 'source/blender/blenlib/intern/noise.c')
-rw-r--r--source/blender/blenlib/intern/noise.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/blenlib/intern/noise.c b/source/blender/blenlib/intern/noise.c
index 6bb59e1e195..f37e1e03f39 100644
--- a/source/blender/blenlib/intern/noise.c
+++ b/source/blender/blenlib/intern/noise.c
@@ -398,7 +398,8 @@ static float orgBlenderNoise(float x, float y, float z)
h = hashvectf + 3 * hash[b21 + b11];
n += i * (h[0] * jx + h[1] * jy + h[2] * jz);
- if (n < 0.0f) n = 0.0f; else if (n > 1.0f) n = 1.0f;
+ if (n < 0.0f) n = 0.0f;
+ else if (n > 1.0f) n = 1.0f;
return n;
}
@@ -1890,7 +1891,8 @@ float mg_RidgedMultiFractal(float x, float y, float z, float H, float lacunarity
y *= lacunarity;
z *= lacunarity;
weight = signal * gain;
- if (weight > 1.0f) weight = 1.0f; else if (weight < 0.0f) weight = 0.0f;
+ if (weight > 1.0f) weight = 1.0f;
+ else if (weight < 0.0f) weight = 0.0f;
signal = offset - fabsf(noisefunc(x, y, z));
signal *= signal;
signal *= weight;