Commit: 3b0c4d888cc5f342c40c6a33fef5ed7c0c3058e7
Author: Sergey Sharybin
Date: Wed Feb 4 15:54:42 2015 +0500
Branches: master
https://developer.blender.org/rB3b0c4d888cc5f342c40c6a33fef5ed7c0c3058e7
GLSL: On some cards '>' can't operate on 'float' and 'int'
So make it so comparison doesn't imply type-cast.
===================================================================
M source/blender/gpu/shaders/gpu_shader_material.glsl
===================================================================
diff --git a/source/blender/gpu/shaders/gpu_shader_material.glsl
b/source/blender/gpu/shaders/gpu_shader_material.glsl
index 17f0c20..a1a4a14 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)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
