diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2016-04-28 18:33:19 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2016-04-28 18:33:19 +0300 |
| commit | 1f723603c882e6d79ab69bea6e5c034ae21a6ce7 (patch) | |
| tree | 098b0133beea06c460c3e9e92010bc669d151e5d /source/blender/nodes/shader/nodes/node_shader_output_material.c | |
| parent | 3632c4997f5019d2a519996d9e216d474aa05d3b (diff) | |
| parent | a48d7407986d04492107a2ef16d0ff6f0d012c45 (diff) | |
Merge branch 'master' into temp_remove_particlestemp_remove_particles
Diffstat (limited to 'source/blender/nodes/shader/nodes/node_shader_output_material.c')
| -rw-r--r-- | source/blender/nodes/shader/nodes/node_shader_output_material.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/nodes/shader/nodes/node_shader_output_material.c b/source/blender/nodes/shader/nodes/node_shader_output_material.c index bd98dc1279c..336536b21ee 100644 --- a/source/blender/nodes/shader/nodes/node_shader_output_material.c +++ b/source/blender/nodes/shader/nodes/node_shader_output_material.c @@ -43,7 +43,7 @@ static int node_shader_gpu_output_material(GPUMaterial *mat, bNode *UNUSED(node) GPU_stack_link(mat, "node_output_material", in, out, &outlink); GPU_material_output_link(mat, outlink); - return 1; + return true; } |