[Bf-blender-cvs] [d6f965b99c] master: Fix T50550: GPUShader: compile error - Background image not showing in viewport.
Kévin Dietrich
noreply at git.blender.org
Sun Jan 29 16:00:47 CET 2017
Commit: d6f965b99c2bb1b028ab0aac7f7a19b889286002
Author: Kévin Dietrich
Date: Sun Jan 29 16:00:14 2017 +0100
Branches: master
https://developer.blender.org/rBd6f965b99c2bb1b028ab0aac7f7a19b889286002
Fix T50550: GPUShader: compile error - Background image not showing in
viewport.
Caused by rBd6cf28c5e15739f864fbf04614c2a50708b4b152, which forgot to
update the GLSL code for the "Light Path" node.
===================================================================
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 aa583c5ecf..0f3ffa8244 100644
--- a/source/blender/gpu/shaders/gpu_shader_material.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_material.glsl
@@ -3536,6 +3536,8 @@ void node_light_path(
out float is_transmission_ray,
out float ray_length,
out float ray_depth,
+ out float diffuse_depth,
+ out float glossy_depth,
out float transparent_depth,
out float transmission_depth)
{
@@ -3548,6 +3550,8 @@ void node_light_path(
is_transmission_ray = 0.0;
ray_length = 1.0;
ray_depth = 1.0;
+ diffuse_depth = 1.0;
+ glossy_depth = 1.0;
transparent_depth = 1.0;
transmission_depth = 1.0;
}
More information about the Bf-blender-cvs
mailing list