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:
authorSergey Sharybin <sergey.vfx@gmail.com>2015-02-04 13:54:42 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-02-04 13:54:42 +0300
commit3b0c4d888cc5f342c40c6a33fef5ed7c0c3058e7 (patch)
treece29ac3675c363a6b758b6dc82bc65df7f7746b1 /source/blender
parentda06dab4e5c9496f32bd01cf4453a3c9f0ffc5c8 (diff)
GLSL: On some cards '>' can't operate on 'float' and 'int'
So make it so comparison doesn't imply type-cast.
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/gpu/shaders/gpu_shader_material.glsl2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/gpu/shaders/gpu_shader_material.glsl b/source/blender/gpu/shaders/gpu_shader_material.glsl
index 17f0c20fad8..a1a4a14e857 100644
--- a/source/blender/gpu/shaders/gpu_shader_material.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_material.glsl
@@ -300,7 +300,7 @@ void math_modulo(float val1, float val2, out float outval)
/* change sign to match C convention, mod in GLSL will take absolute for negative numbers,
* see https://www.opengl.org/sdk/docs/man/html/mod.xhtml */
- outval = (val1 > 0) ? outval : -outval;
+ outval = (val1 > 0.0) ? outval : -outval;
}
void math_abs(float val1, out float outval)