Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix Eevee shader node error when using both RGB and vector curve nodes

Browse Source
This commit is contained in:
Brecht Van Lommel
2020-02-15 17:44:54 +01:00
parent 031dcbf15b
commit c6928843dc
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/gpu/shaders/material/gpu_shader_material_vector_curves.glsl
View File

@@ -1,5 +1,5 @@
/* ext is vec4(in_x, in_dy, out_x, out_dy). */ /* ext is vec4(in_x, in_dy, out_x, out_dy). */
float curve_extrapolate(float x, float y, vec4 ext) float curve_vec_extrapolate(float x, float y, vec4 ext)
{ {
if (x < 0.0) { if (x < 0.0) {
return y + x * ext.y; return y + x * ext.y;
@@ -33,9 +33,9 @@ void curves_vec(float fac,
outvec.y = texture(curvemap, co.yw).y; outvec.y = texture(curvemap, co.yw).y;
outvec.z = texture(curvemap, co.zw).z; outvec.z = texture(curvemap, co.zw).z;
outvec.x = curve_extrapolate(co.x, outvec.r, ext_x); outvec.x = curve_vec_extrapolate(co.x, outvec.r, ext_x);
outvec.y = curve_extrapolate(co.y, outvec.g, ext_y); outvec.y = curve_vec_extrapolate(co.y, outvec.g, ext_y);
outvec.z = curve_extrapolate(co.z, outvec.b, ext_z); outvec.z = curve_vec_extrapolate(co.z, outvec.b, ext_z);
outvec = mix(vec, outvec, fac); outvec = mix(vec, outvec, fac);
} }