diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-07 01:05:58 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-07 01:05:58 +0400 |
| commit | fb56dbc2afc7c8b6ffc24406ed82cbcbff090da3 (patch) | |
| tree | 5832366c7147ad6ebc858312ac106b5d1571b5e5 /source/blender/blenkernel | |
| parent | 3bf96250cde08ab9ad717819114b48ccb11c2d5d (diff) | |
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
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/BKE_node.h | 12 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/node.c | 14 |
2 files changed, 9 insertions, 17 deletions
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index 3ba6cd3793e..9543eefd0c7 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -473,23 +473,19 @@ struct ShadeResult; #define SH_NODE_GEOMETRY 141 #define SH_NODE_LIGHT_PATH 142 #define SH_NODE_TEX_IMAGE 143 -#define SH_NODE_TEX_NOISE 144 #define SH_NODE_TEX_SKY 145 -#define SH_NODE_TEX_BLEND 146 +#define SH_NODE_TEX_GRADIENT 146 #define SH_NODE_TEX_VORONOI 147 #define SH_NODE_TEX_MAGIC 148 -#define SH_NODE_TEX_MARBLE 149 -#define SH_NODE_TEX_CLOUDS 150 -#define SH_NODE_TEX_WOOD 151 +#define SH_NODE_TEX_WAVE 149 +#define SH_NODE_TEX_NOISE 150 #define SH_NODE_TEX_MUSGRAVE 152 -#define SH_NODE_TEX_STUCCI 153 -#define SH_NODE_TEX_DISTNOISE 154 #define SH_NODE_TEX_COORD 155 #define SH_NODE_ADD_SHADER 156 #define SH_NODE_TEX_ENVIRONMENT 157 #define SH_NODE_OUTPUT_TEXTURE 158 #define SH_NODE_HOLDOUT 159 -#define SH_NODE_BLEND_WEIGHT 160 +#define SH_NODE_LAYER_WEIGHT 160 #define SH_NODE_VOLUME_TRANSPARENT 161 #define SH_NODE_VOLUME_ISOTROPIC 162 diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index 4f87c194790..35f32a3b772 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -1896,7 +1896,7 @@ static void registerShaderNodes(ListBase *ntypelist) register_node_type_sh_geometry(ntypelist); register_node_type_sh_light_path(ntypelist); register_node_type_sh_fresnel(ntypelist); - register_node_type_sh_blend_weight(ntypelist); + register_node_type_sh_layer_weight(ntypelist); register_node_type_sh_tex_coord(ntypelist); register_node_type_sh_background(ntypelist); @@ -1922,16 +1922,12 @@ static void registerShaderNodes(ListBase *ntypelist) register_node_type_sh_tex_image(ntypelist); register_node_type_sh_tex_environment(ntypelist); register_node_type_sh_tex_sky(ntypelist); - register_node_type_sh_tex_voronoi(ntypelist); - register_node_type_sh_tex_blend(ntypelist); - register_node_type_sh_tex_magic(ntypelist); - register_node_type_sh_tex_marble(ntypelist); - register_node_type_sh_tex_clouds(ntypelist); - register_node_type_sh_tex_wood(ntypelist); - register_node_type_sh_tex_stucci(ntypelist); register_node_type_sh_tex_noise(ntypelist); - register_node_type_sh_tex_distnoise(ntypelist); + register_node_type_sh_tex_wave(ntypelist); + register_node_type_sh_tex_voronoi(ntypelist); register_node_type_sh_tex_musgrave(ntypelist); + register_node_type_sh_tex_gradient(ntypelist); + register_node_type_sh_tex_magic(ntypelist); } static void registerTextureNodes(ListBase *ntypelist) |