Blender Git Loki
Git Commits -> Revision 958d0d4
Revision 958d0d4 by Charlie Jolly (master) December 7, 2019, 12:52 (GMT) |
Shader Nodes: Add Interpolation modes to Map Range node Modes: Linear interpolation (default), stepped linear, smoothstep and smootherstep. This also includes an additional option for the **Clamp node** to switch between **Min Max** (default) and **Range** mode. This was needed to allow clamping when **To Max** is less than **To Min**. Reviewed By: JacquesLucke, brecht Differential Revision: https://developer.blender.org/D5827 |
Commit Details:
Full Hash: 958d0d4236b1cfa600a7f36f6bdc51fdd0d98a97
Parent Commit: 0406eb1
Lines Changed: +318, -42
18 Modified Paths:
/intern/cycles/blender/blender_shader.cpp (+5, -1) (Diff)
/intern/cycles/kernel/shaders/node_clamp.osl (+6, -2) (Diff)
/intern/cycles/kernel/shaders/node_map_range.osl (+31, -2) (Diff)
/intern/cycles/kernel/svm/svm_clamp.h (+8, -3) (Diff)
/intern/cycles/kernel/svm/svm_map_range.h (+36, -2) (Diff)
/intern/cycles/kernel/svm/svm_types.h (+12, -0) (Diff)
/intern/cycles/render/nodes.cpp (+28, -17) (Diff)
/intern/cycles/render/nodes.h (+3, -2) (Diff)
/source/blender/editors/space_node/drawnode.c (+16, -3) (Diff)
/source/blender/gpu/intern/gpu_material_library.h (+1, -1) (Diff)
/source/blender/gpu/shaders/material/gpu_shader_material_clamp.glsl (+5, -0) (Diff)
/source/blender/gpu/shaders/material/gpu_shader_material_map_range.glsl (+67, -2) (Diff)
/source/blender/makesdna/DNA_node_types.h (+14, -0) (Diff)
/source/blender/makesrna/intern/rna_nodetree.c (+47, -0) (Diff)
/source/blender/makesrna/RNA_enum_types.h (+2, -0) (Diff)
/source/blender/nodes/NOD_static_types.h (+1, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_clamp.c (+8, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_map_range.c (+28, -5) (Diff)
/intern/cycles/kernel/shaders/node_clamp.osl (+6, -2) (Diff)
/intern/cycles/kernel/shaders/node_map_range.osl (+31, -2) (Diff)
/intern/cycles/kernel/svm/svm_clamp.h (+8, -3) (Diff)
/intern/cycles/kernel/svm/svm_map_range.h (+36, -2) (Diff)
/intern/cycles/kernel/svm/svm_types.h (+12, -0) (Diff)
/intern/cycles/render/nodes.cpp (+28, -17) (Diff)
/intern/cycles/render/nodes.h (+3, -2) (Diff)
/source/blender/editors/space_node/drawnode.c (+16, -3) (Diff)
/source/blender/gpu/intern/gpu_material_library.h (+1, -1) (Diff)
/source/blender/gpu/shaders/material/gpu_shader_material_clamp.glsl (+5, -0) (Diff)
/source/blender/gpu/shaders/material/gpu_shader_material_map_range.glsl (+67, -2) (Diff)
/source/blender/makesdna/DNA_node_types.h (+14, -0) (Diff)
/source/blender/makesrna/intern/rna_nodetree.c (+47, -0) (Diff)
/source/blender/makesrna/RNA_enum_types.h (+2, -0) (Diff)
/source/blender/nodes/NOD_static_types.h (+1, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_clamp.c (+8, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_map_range.c (+28, -5) (Diff)