Blender Git Loki
Git Commits -> Revision f9ea097
Revision f9ea097 by Brecht Van Lommel (master) February 3, 2018, 11:20 (GMT) |
Cycles: add Vector Displacement node and extend Displacement node. This adds midlevel and object/world space for displacement, and a vector displacement node with tangent/object/world space, midlevel and scale. Note that tangent space vector displacement still is not exactly compatible with maps created by other software, this will require changes to the tangent computation. Differential Revision: https://developer.blender.org/D1734 |
Commit Details:
Full Hash: f9ea097a872290d20cd94504adb3172165cb770d
Parent Commit: 37beac8
Lines Changed: +502, -48
2 Added Paths:
/intern/cycles/kernel/shaders/node_vector_displacement.osl (+60, -0) (View)
/source/blender/nodes/shader/nodes/node_shader_vector_displacement.c (+82, -0) (View)
/source/blender/nodes/shader/nodes/node_shader_vector_displacement.c (+82, -0) (View)
22 Modified Paths:
/intern/cycles/blender/addon/version_update.py (+8, -0) (Diff)
/intern/cycles/blender/blender_mesh.cpp (+5, -2) (Diff)
/intern/cycles/blender/blender_shader.cpp (+11, -1) (Diff)
/intern/cycles/kernel/shaders/CMakeLists.txt (+1, -0) (Diff)
/intern/cycles/kernel/shaders/node_displacement.osl (+12, -3) (Diff)
/intern/cycles/kernel/svm/svm.h (+3, -0) (Diff)
/intern/cycles/kernel/svm/svm_displace.h (+60, -5) (Diff)
/intern/cycles/kernel/svm/svm_types.h (+1, -0) (Diff)
/intern/cycles/render/nodes.cpp (+105, -2) (Diff)
/intern/cycles/render/nodes.h (+17, -0) (Diff)
/release/scripts/startup/nodeitems_builtins.py (+1, -0) (Diff)
/source/blender/blenkernel/BKE_node.h (+1, -0) (Diff)
/source/blender/blenkernel/intern/node.c (+1, -0) (Diff)
/source/blender/editors/space_node/drawnode.c (+10, -1) (Diff)
/source/blender/gpu/shaders/gpu_shader_material.glsl (+31, -2) (Diff)
/source/blender/makesdna/DNA_node_types.h (+6, -6) (Diff)
/source/blender/makesrna/intern/rna_nodetree.c (+44, -5) (Diff)
/source/blender/nodes/CMakeLists.txt (+1, -0) (Diff)
/source/blender/nodes/NOD_shader.h (+1, -0) (Diff)
/source/blender/nodes/NOD_static_types.h (+2, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_displacement.c (+23, -4) (Diff)
/source/blender/nodes/shader/nodes/node_shader_normal_map.c (+16, -16) (Diff)
/intern/cycles/blender/blender_mesh.cpp (+5, -2) (Diff)
/intern/cycles/blender/blender_shader.cpp (+11, -1) (Diff)
/intern/cycles/kernel/shaders/CMakeLists.txt (+1, -0) (Diff)
/intern/cycles/kernel/shaders/node_displacement.osl (+12, -3) (Diff)
/intern/cycles/kernel/svm/svm.h (+3, -0) (Diff)
/intern/cycles/kernel/svm/svm_displace.h (+60, -5) (Diff)
/intern/cycles/kernel/svm/svm_types.h (+1, -0) (Diff)
/intern/cycles/render/nodes.cpp (+105, -2) (Diff)
/intern/cycles/render/nodes.h (+17, -0) (Diff)
/release/scripts/startup/nodeitems_builtins.py (+1, -0) (Diff)
/source/blender/blenkernel/BKE_node.h (+1, -0) (Diff)
/source/blender/blenkernel/intern/node.c (+1, -0) (Diff)
/source/blender/editors/space_node/drawnode.c (+10, -1) (Diff)
/source/blender/gpu/shaders/gpu_shader_material.glsl (+31, -2) (Diff)
/source/blender/makesdna/DNA_node_types.h (+6, -6) (Diff)
/source/blender/makesrna/intern/rna_nodetree.c (+44, -5) (Diff)
/source/blender/nodes/CMakeLists.txt (+1, -0) (Diff)
/source/blender/nodes/NOD_shader.h (+1, -0) (Diff)
/source/blender/nodes/NOD_static_types.h (+2, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_displacement.c (+23, -4) (Diff)
/source/blender/nodes/shader/nodes/node_shader_normal_map.c (+16, -16) (Diff)