Cycles: replace surface/volume sockets in output nodes with a single shader socket,
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Wed, 12 Oct 2011 15:42:35 +0000 (15:42 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Wed, 12 Oct 2011 15:42:35 +0000 (15:42 +0000)
commit7503a7edfba9496521baefd70fe6cbcbfce5127b
tree9800ef871191ce52396048681d393d62c0c30cc5
parent85818c8209bc6df4f60c7e86173521f5fa1a5a96
Cycles: replace surface/volume sockets in output nodes with a single shader socket,
decided it's better to render objects as either surface or volume.

This may break the volume rendering patch, but shaders with volume closures still
get tagged as having volume closures, so it should be fixable without too many
changes.
20 files changed:
intern/cycles/blender/addon/ui.py
intern/cycles/blender/blender_shader.cpp
intern/cycles/kernel/kernel_shader.h
intern/cycles/kernel/osl/nodes/CMakeLists.txt
intern/cycles/kernel/osl/nodes/node_output_closure.osl [moved from intern/cycles/kernel/osl/nodes/node_output_surface.osl with 90% similarity]
intern/cycles/kernel/osl/nodes/node_output_volume.osl [deleted file]
intern/cycles/kernel/osl/osl_shader.cpp
intern/cycles/kernel/svm/svm.h
intern/cycles/kernel/svm/svm_types.h
intern/cycles/render/nodes.cpp
intern/cycles/render/osl.cpp
intern/cycles/render/shader.cpp
intern/cycles/render/shader.h
intern/cycles/render/svm.cpp
source/blender/blenloader/intern/readfile.c
source/blender/gpu/intern/gpu_shader_material.glsl
source/blender/gpu/intern/gpu_shader_material.glsl.c
source/blender/nodes/shader/nodes/node_shader_output_lamp.c
source/blender/nodes/shader/nodes/node_shader_output_material.c
source/blender/nodes/shader/nodes/node_shader_output_world.c