Cycles: revert commit that joined surface/volume socket into a single shader socket,
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Wed, 12 Oct 2011 23:03:12 +0000 (23:03 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Wed, 12 Oct 2011 23:03:12 +0000 (23:03 +0000)
commit9ebfcea8f392a0ac91247973d2e9ee06f689799c
tree48ee1910bbe7156e262fd2329dc8346c1e314bfa
parent310b25c388aeaf43eeb4b0e4895cc5a24e44cd8e
Cycles: revert commit that joined surface/volume socket into a single shader socket,
on second thought this makes it a bit too difficult to understand what's going on.
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_surface.osl [moved from intern/cycles/kernel/osl/nodes/node_output_closure.osl with 90% similarity]
intern/cycles/kernel/osl/nodes/node_output_volume.osl [new file with mode: 0644]
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