diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-05-22 20:09:42 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-05-22 20:10:15 +0300 |
| commit | 2f978656ab7d076706ef458ddd7674a6f653cad8 (patch) | |
| tree | 490458542cfcff566c3a72962051f6c9dfe7ce8b /source/blender/nodes | |
| parent | 22ff9c5568cdcf9a5c7ec7925469dea651e2aab5 (diff) | |
Support Musgrave texture for Cycles GLSL viewport
Only for non-OSX viewport!
Diffstat (limited to 'source/blender/nodes')
| -rw-r--r-- | source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c b/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c index 825ba7eb3c1..51d6699fadd 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c +++ b/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c @@ -58,12 +58,17 @@ static void node_shader_init_tex_musgrave(bNodeTree *UNUSED(ntree), bNode *node) static int node_shader_gpu_tex_musgrave(GPUMaterial *mat, bNode *node, bNodeExecData *UNUSED(execdata), GPUNodeStack *in, GPUNodeStack *out) { - if (!in[0].link) + if (!in[0].link) { in[0].link = GPU_attribute(CD_ORCO, ""); + GPU_link(mat, "generated_from_orco", in[0].link, &in[0].link); + } node_shader_gpu_tex_mapping(mat, node, in, out); - return GPU_stack_link(mat, "node_tex_musgrave", in, out); + NodeTexMusgrave *tex = (NodeTexMusgrave *)node->storage; + float type = tex->musgrave_type; + + return GPU_stack_link(mat, "node_tex_musgrave", in, out, GPU_uniform(&type)); } /* node type definition */ |