Blender Git Loki
Git Commits -> Revision 66b1dfa
Revision 66b1dfa by Brecht Van Lommel (master) September 16, 2011, 13:14 (GMT) |
Cycles: tweaks to properties and nodes * Passes renamed to samples * Camera lens radius renamed to aperature size/blades/rotation * Glass and fresnel nodes input is now index of refraction * Glossy and velvet fresnel socket removed * Mix/add closure node renamed to mix/add shader node * Blend weight node added for shader mixing weights There is some version patching code for reading existing files, but it's not perfect, so shaders may work a bit different. |
Commit Details:
Full Hash: 66b1dfae89cc44953bd51c5da962cab437e76972
SVN Revision: 40262
Parent Commit: 0a5fcf3
Lines Changed: +901, -541
4 Added Paths:
/intern/cycles/kernel/osl/nodes/node_blend_weight.osl (+42, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_add_shader.c (+69, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_blend_weight.c (+68, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_mix_shader.c (+70, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_add_shader.c (+69, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_blend_weight.c (+68, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_mix_shader.c (+70, -0) (View)
2 Deleted Paths:
/source/blender/nodes/intern/SHD_nodes/SHD_add_closure.c (+0, -69)
/source/blender/nodes/intern/SHD_nodes/SHD_mix_closure.c (+0, -70)
/source/blender/nodes/intern/SHD_nodes/SHD_mix_closure.c (+0, -70)
78 Modified Paths:
/intern/cycles/app/cycles_test.cpp (+15, -15) (Diff)
/intern/cycles/app/cycles_xml.cpp (+1, -1) (Diff)
/intern/cycles/blender/addon/properties.py (+9, -3) (Diff)
/intern/cycles/blender/addon/ui.py (+27, -10) (Diff)
/intern/cycles/blender/blender_camera.cpp (+10, -3) (Diff)
/intern/cycles/blender/blender_session.cpp (+13, -13) (Diff)
/intern/cycles/blender/blender_shader.cpp (+22, -4) (Diff)
/intern/cycles/blender/blender_sync.cpp (+13, -9) (Diff)
/intern/cycles/device/device.cpp (+1, -1) (Diff)
/intern/cycles/device/device.h (+1, -1) (Diff)
/intern/cycles/device/device_cpu.cpp (+2, -2) (Diff)
/intern/cycles/device/device_cuda.cpp (+8, -8) (Diff)
/intern/cycles/device/device_network.cpp (+12, -12) (Diff)
/intern/cycles/device/device_opencl.cpp (+6, -6) (Diff)
/intern/cycles/kernel/kernel.cl (+4, -4) (Diff)
/intern/cycles/kernel/kernel.cpp (+4, -4) (Diff)
/intern/cycles/kernel/kernel.cu (+4, -4) (Diff)
/intern/cycles/kernel/kernel.h (+2, -2) (Diff)
/intern/cycles/kernel/kernel_camera.h (+19, -7) (Diff)
/intern/cycles/kernel/kernel_film.h (+4, -4) (Diff)
/intern/cycles/kernel/kernel_montecarlo.h (+24, -0) (Diff)
/intern/cycles/kernel/kernel_path.h (+22, -22) (Diff)
/intern/cycles/kernel/kernel_random.h (+11, -11) (Diff)
/intern/cycles/kernel/kernel_types.h (+10, -9) (Diff)
/intern/cycles/kernel/osl/nodes/CMakeLists.txt (+1, -0) (Diff)
/intern/cycles/kernel/osl/nodes/node_environment_texture.osl (+3, -2) (Diff)
/intern/cycles/kernel/osl/nodes/node_fresnel.osl (+4, -3) (Diff)
/intern/cycles/kernel/osl/nodes/node_glass_bsdf.osl (+3, -3) (Diff)
/intern/cycles/kernel/osl/nodes/node_glossy_bsdf.osl (+3, -11) (Diff)
/intern/cycles/kernel/osl/nodes/node_image_texture.osl (+3, -2) (Diff)
/intern/cycles/kernel/osl/nodes/node_velvet_bsdf.osl (+1, -9) (Diff)
/intern/cycles/kernel/svm/svm.h (+3, -0) (Diff)
/intern/cycles/kernel/svm/svm_closure.h (+11, -27) (Diff)
/intern/cycles/kernel/svm/svm_fresnel.h (+40, -4) (Diff)
/intern/cycles/kernel/svm/svm_image.h (+12, -6) (Diff)
/intern/cycles/kernel/svm/svm_types.h (+7, -1) (Diff)
/intern/cycles/render/buffers.cpp (+2, -2) (Diff)
/intern/cycles/render/buffers.h (+1, -1) (Diff)
/intern/cycles/render/camera.cpp (+9, -3) (Diff)
/intern/cycles/render/camera.h (+3, -1) (Diff)
/intern/cycles/render/nodes.cpp (+75, -18) (Diff)
/intern/cycles/render/nodes.h (+5, -0) (Diff)
/intern/cycles/render/scene.h (+2, -0) (Diff)
/intern/cycles/render/session.cpp (+30, -30) (Diff)
/intern/cycles/render/session.h (+10, -10) (Diff)
/intern/cycles/render/svm.cpp (+5, -4) (Diff)
/intern/cycles/render/svm.h (+3, -1) (Diff)
/intern/cycles/render/tile.cpp (+9, -9) (Diff)
/intern/cycles/render/tile.h (+5, -5) (Diff)
/intern/cycles/util/util_progress.h (+12, -12) (Diff)
/release/scripts/startup/bl_ui/properties_data_camera.py (+9, -4) (Diff)
/source/blender/blenkernel/BKE_node.h (+4, -3) (Diff)
/source/blender/blenkernel/intern/node.c (+6, -5) (Diff)
/source/blender/blenloader/intern/readfile.c (+57, -2) (Diff)
/source/blender/editors/interface/interface_node.c (+5, -5) (Diff)
/source/blender/editors/space_node/node_draw.c (+1, -1) (Diff)
/source/blender/editors/space_node/node_edit.c (+6, -6) (Diff)
/source/blender/editors/space_node/node_header.c (+3, -3) (Diff)
/source/blender/gpu/intern/gpu_shader_material.glsl (+10, -10) (Diff)
/source/blender/makesdna/DNA_node_types.h (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_nodetree.c (+6, -6) (Diff)
/source/blender/makesrna/intern/rna_nodetree_types.h (+3, -2) (Diff)
/source/blender/nodes/CMakeLists.txt (+3, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_background.c (+2, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_anisotropic.c (+2, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_diffuse.c (+2, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_glass.c (+3, -3) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_glossy.c (+2, -3) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_translucent.c (+2, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_transparent.c (+2, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_velvet.c (+2, -3) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_emission.c (+3, -3) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_fresnel.c (+2, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_holdout.c (+2, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_output_lamp.c (+1, -1) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_output_material.c (+2, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_output_world.c (+2, -2) (Diff)
/source/blender/nodes/SHD_node.h (+3, -2) (Diff)
/intern/cycles/app/cycles_xml.cpp (+1, -1) (Diff)
/intern/cycles/blender/addon/properties.py (+9, -3) (Diff)
/intern/cycles/blender/addon/ui.py (+27, -10) (Diff)
/intern/cycles/blender/blender_camera.cpp (+10, -3) (Diff)
/intern/cycles/blender/blender_session.cpp (+13, -13) (Diff)
/intern/cycles/blender/blender_shader.cpp (+22, -4) (Diff)
/intern/cycles/blender/blender_sync.cpp (+13, -9) (Diff)
/intern/cycles/device/device.cpp (+1, -1) (Diff)
/intern/cycles/device/device.h (+1, -1) (Diff)
/intern/cycles/device/device_cpu.cpp (+2, -2) (Diff)
/intern/cycles/device/device_cuda.cpp (+8, -8) (Diff)
/intern/cycles/device/device_network.cpp (+12, -12) (Diff)
/intern/cycles/device/device_opencl.cpp (+6, -6) (Diff)
/intern/cycles/kernel/kernel.cl (+4, -4) (Diff)
/intern/cycles/kernel/kernel.cpp (+4, -4) (Diff)
/intern/cycles/kernel/kernel.cu (+4, -4) (Diff)
/intern/cycles/kernel/kernel.h (+2, -2) (Diff)
/intern/cycles/kernel/kernel_camera.h (+19, -7) (Diff)
/intern/cycles/kernel/kernel_film.h (+4, -4) (Diff)
/intern/cycles/kernel/kernel_montecarlo.h (+24, -0) (Diff)
/intern/cycles/kernel/kernel_path.h (+22, -22) (Diff)
/intern/cycles/kernel/kernel_random.h (+11, -11) (Diff)
/intern/cycles/kernel/kernel_types.h (+10, -9) (Diff)
/intern/cycles/kernel/osl/nodes/CMakeLists.txt (+1, -0) (Diff)
/intern/cycles/kernel/osl/nodes/node_environment_texture.osl (+3, -2) (Diff)
/intern/cycles/kernel/osl/nodes/node_fresnel.osl (+4, -3) (Diff)
/intern/cycles/kernel/osl/nodes/node_glass_bsdf.osl (+3, -3) (Diff)
/intern/cycles/kernel/osl/nodes/node_glossy_bsdf.osl (+3, -11) (Diff)
/intern/cycles/kernel/osl/nodes/node_image_texture.osl (+3, -2) (Diff)
/intern/cycles/kernel/osl/nodes/node_velvet_bsdf.osl (+1, -9) (Diff)
/intern/cycles/kernel/svm/svm.h (+3, -0) (Diff)
/intern/cycles/kernel/svm/svm_closure.h (+11, -27) (Diff)
/intern/cycles/kernel/svm/svm_fresnel.h (+40, -4) (Diff)
/intern/cycles/kernel/svm/svm_image.h (+12, -6) (Diff)
/intern/cycles/kernel/svm/svm_types.h (+7, -1) (Diff)
/intern/cycles/render/buffers.cpp (+2, -2) (Diff)
/intern/cycles/render/buffers.h (+1, -1) (Diff)
/intern/cycles/render/camera.cpp (+9, -3) (Diff)
/intern/cycles/render/camera.h (+3, -1) (Diff)
/intern/cycles/render/nodes.cpp (+75, -18) (Diff)
/intern/cycles/render/nodes.h (+5, -0) (Diff)
/intern/cycles/render/scene.h (+2, -0) (Diff)
/intern/cycles/render/session.cpp (+30, -30) (Diff)
/intern/cycles/render/session.h (+10, -10) (Diff)
/intern/cycles/render/svm.cpp (+5, -4) (Diff)
/intern/cycles/render/svm.h (+3, -1) (Diff)
/intern/cycles/render/tile.cpp (+9, -9) (Diff)
/intern/cycles/render/tile.h (+5, -5) (Diff)
/intern/cycles/util/util_progress.h (+12, -12) (Diff)
/release/scripts/startup/bl_ui/properties_data_camera.py (+9, -4) (Diff)
/source/blender/blenkernel/BKE_node.h (+4, -3) (Diff)
/source/blender/blenkernel/intern/node.c (+6, -5) (Diff)
/source/blender/blenloader/intern/readfile.c (+57, -2) (Diff)
/source/blender/editors/interface/interface_node.c (+5, -5) (Diff)
/source/blender/editors/space_node/node_draw.c (+1, -1) (Diff)
/source/blender/editors/space_node/node_edit.c (+6, -6) (Diff)
/source/blender/editors/space_node/node_header.c (+3, -3) (Diff)
/source/blender/gpu/intern/gpu_shader_material.glsl (+10, -10) (Diff)
/source/blender/makesdna/DNA_node_types.h (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_nodetree.c (+6, -6) (Diff)
/source/blender/makesrna/intern/rna_nodetree_types.h (+3, -2) (Diff)
/source/blender/nodes/CMakeLists.txt (+3, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_background.c (+2, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_anisotropic.c (+2, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_diffuse.c (+2, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_glass.c (+3, -3) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_glossy.c (+2, -3) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_translucent.c (+2, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_transparent.c (+2, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_velvet.c (+2, -3) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_emission.c (+3, -3) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_fresnel.c (+2, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_holdout.c (+2, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_output_lamp.c (+1, -1) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_output_material.c (+2, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_output_world.c (+2, -2) (Diff)
/source/blender/nodes/SHD_node.h (+3, -2) (Diff)