Cycles: procedural texture nodes reorganization. This will break existing files
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Sun, 6 Nov 2011 21:05:58 +0000 (21:05 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Sun, 6 Nov 2011 21:05:58 +0000 (21:05 +0000)
commitfb56dbc2afc7c8b6ffc24406ed82cbcbff090da3
tree5832366c7147ad6ebc858312ac106b5d1571b5e5
parent3bf96250cde08ab9ad717819114b48ccb11c2d5d
Cycles: procedural texture nodes reorganization. This will break existing files
using them, but rather do it now that I have the chance still. Highlights:

* Wood and Marble merged into a single Wave texture
* Clouds + Distorted Noise merged into new Noise node
* Blend renamed to Gradient
* Stucci removed, was mostly useful for old bump
* Noise removed, will come back later, didn't actually work yet
* Depth setting is now Detail socket, which accepts float values
* Scale socket instead of Size socket

http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures
42 files changed:
intern/cycles/blender/blender_shader.cpp
intern/cycles/kernel/CMakeLists.txt
intern/cycles/kernel/svm/svm.h
intern/cycles/kernel/svm/svm_clouds.h [deleted file]
intern/cycles/kernel/svm/svm_distorted_noise.h [deleted file]
intern/cycles/kernel/svm/svm_fresnel.h
intern/cycles/kernel/svm/svm_gradient.h [moved from intern/cycles/kernel/svm/svm_blend.h with 64% similarity]
intern/cycles/kernel/svm/svm_magic.h
intern/cycles/kernel/svm/svm_marble.h [deleted file]
intern/cycles/kernel/svm/svm_musgrave.h
intern/cycles/kernel/svm/svm_noisetex.h
intern/cycles/kernel/svm/svm_stucci.h [deleted file]
intern/cycles/kernel/svm/svm_texture.h
intern/cycles/kernel/svm/svm_types.h
intern/cycles/kernel/svm/svm_voronoi.h
intern/cycles/kernel/svm/svm_wave.h [new file with mode: 0644]
intern/cycles/kernel/svm/svm_wood.h [deleted file]
intern/cycles/render/nodes.cpp
intern/cycles/render/nodes.h
intern/cycles/util/util_hash.h
source/blender/blenkernel/BKE_node.h
source/blender/blenkernel/intern/node.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_node/drawnode.c
source/blender/makesdna/DNA_node_types.h
source/blender/makesrna/intern/rna_nodetree.c
source/blender/makesrna/intern/rna_nodetree_types.h
source/blender/nodes/CMakeLists.txt
source/blender/nodes/NOD_shader.h
source/blender/nodes/shader/nodes/node_shader_layer_weight.c [moved from source/blender/nodes/shader/nodes/node_shader_blend_weight.c with 71% similarity]
source/blender/nodes/shader/nodes/node_shader_noise.h
source/blender/nodes/shader/nodes/node_shader_tex_clouds.c [deleted file]
source/blender/nodes/shader/nodes/node_shader_tex_distnoise.c [deleted file]
source/blender/nodes/shader/nodes/node_shader_tex_gradient.c [moved from source/blender/nodes/shader/nodes/node_shader_tex_blend.c with 62% similarity]
source/blender/nodes/shader/nodes/node_shader_tex_magic.c
source/blender/nodes/shader/nodes/node_shader_tex_marble.c [deleted file]
source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
source/blender/nodes/shader/nodes/node_shader_tex_noise.c
source/blender/nodes/shader/nodes/node_shader_tex_stucci.c [deleted file]
source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
source/blender/nodes/shader/nodes/node_shader_tex_wave.c [new file with mode: 0644]
source/blender/nodes/shader/nodes/node_shader_tex_wood.c [deleted file]