Commit: 5b1df033e773159ae541a81b568c163e1fd9e64a Author: OmarSquircleArt Date: Mon Aug 5 14:54:51 2019 +0200 Branches: soc-2019-cycles-procedural https://developer.blender.org/rB5b1df033e773159ae541a81b568c163e1fd9e64a
Revert accidental renamming from previouse commit. =================================================================== 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 a8a570edf43..37569afec7d 100644 --- a/source/blender/gpu/shaders/gpu_shader_material.glsl +++ b/source/blender/gpu/shaders/gpu_shader_material.glsl @@ -2778,7 +2778,7 @@ void node_tex_image_cubic_ex( #if 1 /* Optimized version using 4 filtered tap. */ vec2 s0 = w0 + w1; - vec2 sx = w2 + w3; + vec2 s1 = w2 + w3; vec2 f0 = w1 / (w0 + w1); vec2 f1 = w3 / (w2 + w3); @@ -2793,9 +2793,9 @@ void node_tex_image_cubic_ex( final_co /= tex_size.xyxy; color = safe_color(textureLod(ima, final_co.xy, 0.0)) * s0.x * s0.y; - color += safe_color(textureLod(ima, final_co.zy, 0.0)) * sx.x * s0.y; - color += safe_color(textureLod(ima, final_co.xw, 0.0)) * s0.x * sx.y; - color += safe_color(textureLod(ima, final_co.zw, 0.0)) * sx.x * sx.y; + color += safe_color(textureLod(ima, final_co.zy, 0.0)) * s1.x * s0.y; + color += safe_color(textureLod(ima, final_co.xw, 0.0)) * s0.x * s1.y; + color += safe_color(textureLod(ima, final_co.zw, 0.0)) * s1.x * s1.y; #else /* Reference bruteforce 16 tap. */ color = texelFetch(ima, ivec2(tc + vec2(-1.0, -1.0)), 0) * w0.x * w0.y; _______________________________________________ Bf-blender-cvs mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-blender-cvs
