diff options
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/space_node/drawnode.c | 61 |
1 files changed, 7 insertions, 54 deletions
diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index 45713ff2a8f..c27d7e74cd7 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -1028,23 +1028,9 @@ static void node_shader_buts_tex_sky(uiLayout *layout, bContext *UNUSED(C), Poin uiItemR(layout, ptr, "turbidity", 0, NULL, ICON_NONE); } -static void node_shader_buts_tex_blend(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_shader_buts_tex_gradient(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) { - uiItemR(layout, ptr, "progression", 0, "", ICON_NONE); - uiItemR(layout, ptr, "axis", 0, "", ICON_NONE); -} - -static void node_shader_buts_tex_clouds(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) -{ - uiItemR(layout, ptr, "noise_basis", 0, "", ICON_NONE); - uiItemR(layout, ptr, "noise_type", 0, "", ICON_NONE); - uiItemR(layout, ptr, "turbulence_depth", 0, NULL, ICON_NONE); -} - -static void node_shader_buts_tex_distnoise(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) -{ - uiItemR(layout, ptr, "noise_basis", 0, "", ICON_NONE); - uiItemR(layout, ptr, "noise_distortion", 0, "", ICON_NONE); + uiItemR(layout, ptr, "gradient_type", 0, "", ICON_NONE); } static void node_shader_buts_tex_magic(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) @@ -1052,42 +1038,21 @@ static void node_shader_buts_tex_magic(uiLayout *layout, bContext *UNUSED(C), Po uiItemR(layout, ptr, "turbulence_depth", 0, NULL, ICON_NONE); } -static void node_shader_buts_tex_marble(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_shader_buts_tex_wave(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) { - uiItemR(layout, ptr, "marble_type", 0, "", ICON_NONE); - uiItemR(layout, ptr, "noise_basis", 0, "", ICON_NONE); - uiItemR(layout, ptr, "noise_type", 0, "", ICON_NONE); - uiItemR(layout, ptr, "turbulence_depth", 0, NULL, ICON_NONE); uiItemR(layout, ptr, "wave_type", 0, "", ICON_NONE); } static void node_shader_buts_tex_musgrave(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) { uiItemR(layout, ptr, "musgrave_type", 0, "", ICON_NONE); - uiItemR(layout, ptr, "noise_basis", 0, "", ICON_NONE); -} - -static void node_shader_buts_tex_stucci(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) -{ - uiItemR(layout, ptr, "stucci_type", 0, "", ICON_NONE); - uiItemR(layout, ptr, "noise_basis", 0, "", ICON_NONE); - uiItemR(layout, ptr, "noise_type", 0, "", ICON_NONE); } static void node_shader_buts_tex_voronoi(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) { - uiItemR(layout, ptr, "distance_metric", 0, "", ICON_NONE); uiItemR(layout, ptr, "coloring", 0, "", ICON_NONE); } -static void node_shader_buts_tex_wood(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) -{ - uiItemR(layout, ptr, "noise_basis", 0, "", ICON_NONE); - uiItemR(layout, ptr, "noise_type", 0, "", ICON_NONE); - uiItemR(layout, ptr, "wood_type", 0, "", ICON_NONE); - uiItemR(layout, ptr, "wave_type", 0, "", ICON_NONE); -} - static void node_shader_buts_glossy(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) { uiItemR(layout, ptr, "distribution", 0, "", ICON_NONE); @@ -1191,33 +1156,21 @@ static void node_shader_set_butfunc(bNodeType *ntype) case SH_NODE_TEX_ENVIRONMENT: ntype->uifunc= node_shader_buts_tex_image; break; - case SH_NODE_TEX_BLEND: - ntype->uifunc= node_shader_buts_tex_blend; - break; - case SH_NODE_TEX_CLOUDS: - ntype->uifunc= node_shader_buts_tex_clouds; - break; - case SH_NODE_TEX_DISTNOISE: - ntype->uifunc= node_shader_buts_tex_distnoise; + case SH_NODE_TEX_GRADIENT: + ntype->uifunc= node_shader_buts_tex_gradient; break; case SH_NODE_TEX_MAGIC: ntype->uifunc= node_shader_buts_tex_magic; break; - case SH_NODE_TEX_MARBLE: - ntype->uifunc= node_shader_buts_tex_marble; + case SH_NODE_TEX_WAVE: + ntype->uifunc= node_shader_buts_tex_wave; break; case SH_NODE_TEX_MUSGRAVE: ntype->uifunc= node_shader_buts_tex_musgrave; break; - case SH_NODE_TEX_STUCCI: - ntype->uifunc= node_shader_buts_tex_stucci; - break; case SH_NODE_TEX_VORONOI: ntype->uifunc= node_shader_buts_tex_voronoi; break; - case SH_NODE_TEX_WOOD: - ntype->uifunc= node_shader_buts_tex_wood; - break; case SH_NODE_BSDF_GLOSSY: case SH_NODE_BSDF_GLASS: ntype->uifunc= node_shader_buts_glossy; |