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:
-rw-r--r--intern/cycles/kernel/shaders/node_magic_texture.osl2
-rw-r--r--intern/cycles/kernel/shaders/node_rgb_curves.osl2
-rw-r--r--intern/cycles/kernel/shaders/node_vector_curves.osl2
-rw-r--r--intern/cycles/kernel/shaders/node_voxel_texture.osl4
-rw-r--r--intern/cycles/kernel/shaders/node_wave_texture.osl2
5 files changed, 6 insertions, 6 deletions
diff --git a/intern/cycles/kernel/shaders/node_magic_texture.osl b/intern/cycles/kernel/shaders/node_magic_texture.osl
index 97f1fcd76b5..55992e3494c 100644
--- a/intern/cycles/kernel/shaders/node_magic_texture.osl
+++ b/intern/cycles/kernel/shaders/node_magic_texture.osl
@@ -106,6 +106,6 @@ shader node_magic_texture(
p = transform(mapping, p);
Color = magic(p * Scale, Depth, Distortion);
- Fac = (Color[0] + Color[1] + Color[2]) * (1.0/3.0);
+ Fac = (Color[0] + Color[1] + Color[2]) * (1.0 / 3.0);
}
diff --git a/intern/cycles/kernel/shaders/node_rgb_curves.osl b/intern/cycles/kernel/shaders/node_rgb_curves.osl
index 0427c001f6d..fc93dbd044b 100644
--- a/intern/cycles/kernel/shaders/node_rgb_curves.osl
+++ b/intern/cycles/kernel/shaders/node_rgb_curves.osl
@@ -21,7 +21,7 @@ float ramp_lookup(color ramp[RAMP_TABLE_SIZE], float at, int component)
{
if (at < 0.0 || at > 1.0) {
float t0, dy;
- if(at < 0.0) {
+ if (at < 0.0) {
t0 = ramp[0][component];
dy = t0 - ramp[1][component];
at = -at;
diff --git a/intern/cycles/kernel/shaders/node_vector_curves.osl b/intern/cycles/kernel/shaders/node_vector_curves.osl
index f7f7734f4e5..4d4c28b57a2 100644
--- a/intern/cycles/kernel/shaders/node_vector_curves.osl
+++ b/intern/cycles/kernel/shaders/node_vector_curves.osl
@@ -21,7 +21,7 @@ float ramp_lookup(color ramp[RAMP_TABLE_SIZE], float at, int component)
{
if (at < 0.0 || at > 1.0) {
float t0, dy;
- if(at < 0.0) {
+ if (at < 0.0) {
t0 = ramp[0][component];
dy = t0 - ramp[1][component];
at = -at;
diff --git a/intern/cycles/kernel/shaders/node_voxel_texture.osl b/intern/cycles/kernel/shaders/node_voxel_texture.osl
index e45af62220f..9253febd64a 100644
--- a/intern/cycles/kernel/shaders/node_voxel_texture.osl
+++ b/intern/cycles/kernel/shaders/node_voxel_texture.osl
@@ -35,8 +35,8 @@ shader node_voxel_texture(
if (getattribute("geom:generated_transform", tfm))
p = transform(tfm, p);
}
- if(p[0] < 0.0 || p[1] < 0.0 || p[2] < 0.0 ||
- p[0] > 1.0 || p[1] > 1.0 || p[2] > 1.0)
+ if (p[0] < 0.0 || p[1] < 0.0 || p[2] < 0.0 ||
+ p[0] > 1.0 || p[1] > 1.0 || p[2] > 1.0)
{
Density = 0;
Color = color(0, 0, 0);
diff --git a/intern/cycles/kernel/shaders/node_wave_texture.osl b/intern/cycles/kernel/shaders/node_wave_texture.osl
index beb2a9de112..59f61d3b46a 100644
--- a/intern/cycles/kernel/shaders/node_wave_texture.osl
+++ b/intern/cycles/kernel/shaders/node_wave_texture.osl
@@ -41,7 +41,7 @@ float wave(point p, string type, string profile, float detail, float distortion,
/* Saw profile */
n /= M_2PI;
n -= (int) n;
- return (n < 0.0)? n + 1.0: n;
+ return (n < 0.0) ? n + 1.0 : n;
}
}