diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-05-18 17:30:34 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-05-18 17:30:34 +0400 |
| commit | 578864180b1e40a8689064763437247ff7a5826b (patch) | |
| tree | 6dfd0b6a2a6a513eced8cf62e0fb42c3c340aa57 /source/blender/nodes | |
| parent | 894dd820ac6ffcb19ff74cf662ff2d4ce3e5179b (diff) | |
Fix related to #31446: cycles glsl error with empty image texture node.
Diffstat (limited to 'source/blender/nodes')
| -rw-r--r-- | source/blender/nodes/shader/nodes/node_shader_tex_environment.c | 7 | ||||
| -rw-r--r-- | source/blender/nodes/shader/nodes/node_shader_tex_image.c | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_environment.c b/source/blender/nodes/shader/nodes/node_shader_tex_environment.c index 852c056dc28..9e80f79b0c5 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_environment.c +++ b/source/blender/nodes/shader/nodes/node_shader_tex_environment.c @@ -55,11 +55,8 @@ static int node_shader_gpu_tex_environment(GPUMaterial *mat, bNode *node, GPUNod Image *ima= (Image*)node->id; ImageUser *iuser= NULL; - if (!ima) { - float black[4] = {0.0f, 0.0f, 0.0f, 1.0f}; - GPUNodeLink *vec = GPU_uniform(black); - return GPU_stack_link(mat, "set_rgba", out, out, vec); - } + if (!ima) + return GPU_stack_link(mat, "node_tex_environment_empty", in, out); if (!in[0].link) in[0].link = GPU_builtin(GPU_VIEW_POSITION); diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_image.c b/source/blender/nodes/shader/nodes/node_shader_tex_image.c index 28dcada3d33..e00467a52ef 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_image.c +++ b/source/blender/nodes/shader/nodes/node_shader_tex_image.c @@ -55,11 +55,8 @@ static int node_shader_gpu_tex_image(GPUMaterial *mat, bNode *node, GPUNodeStack Image *ima= (Image*)node->id; ImageUser *iuser= NULL; - if (!ima) { - float black[4] = {0.0f, 0.0f, 0.0f, 1.0f}; - GPUNodeLink *vec = GPU_uniform(black); - return GPU_stack_link(mat, "set_rgba", out, out, vec); - } + if (!ima) + return GPU_stack_link(mat, "node_tex_image_empty", in, out); if (!in[0].link) in[0].link = GPU_attribute(CD_MTFACE, ""); |