Blender Git Loki
Git Commits -> Revision baaa89a
Revision baaa89a by Omar Emara (master) September 4, 2019, 21:17 (GMT) |
Shading: Rewrite Mapping node with dynamic inputs. This patch rewrites the Mapping node to support dynamic inputs. The Max and Min options have been removed. They can be added as Min and Max Vector Math nodes manually. Texture nodes still use the old matrix-based mapping. A new SVM node `NODE_TEXTURE_MAPPING` has been added to preserve this functionality. Similarly, in GLSL, a `mapping_mat4` function has been added. Reviewers: brecht, JacquesLucke |
Commit Details:
Full Hash: baaa89a0bc54a659f9ddbc34cce21d6920c0f6a6
Parent Commit: f098f6d
Lines Changed: +467, -240
1 Added Path:
/intern/cycles/kernel/svm/svm_mapping_util.h (+39, -0) (View)
23 Modified Paths:
/intern/cycles/blender/blender_shader.cpp (+1, -21) (Diff)
/intern/cycles/kernel/CMakeLists.txt (+1, -0) (Diff)
/intern/cycles/kernel/shaders/node_mapping.osl (+51, -10) (Diff)
/intern/cycles/kernel/svm/svm.h (+5, -1) (Diff)
/intern/cycles/kernel/svm/svm_mapping.h (+27, -1) (Diff)
/intern/cycles/kernel/svm/svm_types.h (+8, -0) (Diff)
/intern/cycles/render/constant_fold.cpp (+17, -0) (Diff)
/intern/cycles/render/constant_fold.h (+1, -0) (Diff)
/intern/cycles/render/nodes.cpp (+39, -9) (Diff)
/intern/cycles/render/nodes.h (+3, -2) (Diff)
/intern/cycles/util/util_transform.h (+26, -0) (Diff)
/source/blender/blenkernel/BKE_blender_version.h (+1, -1) (Diff)
/source/blender/blenloader/intern/versioning_cycles.c (+148, -0) (Diff)
/source/blender/editors/space_node/drawnode.c (+1, -31) (Diff)
/source/blender/gpu/intern/gpu_material_library.h (+1, -1) (Diff)
/source/blender/gpu/shaders/material/gpu_shader_material_mapping.glsl (+21, -1) (Diff)
/source/blender/gpu/shaders/material/gpu_shader_material_math_util.glsl (+24, -0) (Diff)
/source/blender/makesdna/DNA_node_types.h (+8, -0) (Diff)
/source/blender/makesrna/intern/rna_nodetree.c (+23, -65) (Diff)
/source/blender/makesrna/intern/rna_texture.c (+1, -13) (Diff)
/source/blender/makesrna/RNA_enum_types.h (+1, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_mapping.c (+19, -83) (Diff)
/source/blender/nodes/shader/node_shader_util.c (+1, -1) (Diff)
/intern/cycles/kernel/CMakeLists.txt (+1, -0) (Diff)
/intern/cycles/kernel/shaders/node_mapping.osl (+51, -10) (Diff)
/intern/cycles/kernel/svm/svm.h (+5, -1) (Diff)
/intern/cycles/kernel/svm/svm_mapping.h (+27, -1) (Diff)
/intern/cycles/kernel/svm/svm_types.h (+8, -0) (Diff)
/intern/cycles/render/constant_fold.cpp (+17, -0) (Diff)
/intern/cycles/render/constant_fold.h (+1, -0) (Diff)
/intern/cycles/render/nodes.cpp (+39, -9) (Diff)
/intern/cycles/render/nodes.h (+3, -2) (Diff)
/intern/cycles/util/util_transform.h (+26, -0) (Diff)
/source/blender/blenkernel/BKE_blender_version.h (+1, -1) (Diff)
/source/blender/blenloader/intern/versioning_cycles.c (+148, -0) (Diff)
/source/blender/editors/space_node/drawnode.c (+1, -31) (Diff)
/source/blender/gpu/intern/gpu_material_library.h (+1, -1) (Diff)
/source/blender/gpu/shaders/material/gpu_shader_material_mapping.glsl (+21, -1) (Diff)
/source/blender/gpu/shaders/material/gpu_shader_material_math_util.glsl (+24, -0) (Diff)
/source/blender/makesdna/DNA_node_types.h (+8, -0) (Diff)
/source/blender/makesrna/intern/rna_nodetree.c (+23, -65) (Diff)
/source/blender/makesrna/intern/rna_texture.c (+1, -13) (Diff)
/source/blender/makesrna/RNA_enum_types.h (+1, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_mapping.c (+19, -83) (Diff)
/source/blender/nodes/shader/node_shader_util.c (+1, -1) (Diff)
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021