diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-04-05 10:05:55 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-04-05 10:05:55 +0400 |
commit | dcb26e4e47bf781a8d7953cca4979d9ab5c41af0 (patch) | |
tree | 0a87a80eafb95c3e15269e8f9d2c6ca485750ebd /source | |
parent | db6ea4d3a5852882cdf8bfac125ca789532b694a (diff) |
fix [#26782] Missing settings in some texture nodes.
also rename noisebasis_2 --> noise_basis_2
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/space_node/drawnode.c | 30 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_texture.c | 4 |
2 files changed, 30 insertions, 4 deletions
diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index 6ee4c616bdc..78c295a56cb 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -1227,14 +1227,28 @@ static void node_texture_buts_proc(uiLayout *layout, bContext *UNUSED(C), Pointe row= uiLayoutRow(col, 0); uiItemR(row, &tex_ptr, "noise_type", UI_ITEM_R_EXPAND, NULL, ICON_NONE); row= uiLayoutRow(col, 0); - uiItemR(row, &tex_ptr, "noisebasis_2", UI_ITEM_R_EXPAND, NULL, ICON_NONE); + uiItemR(row, &tex_ptr, "noise_basis", 0, "", ICON_NONE); + row= uiLayoutRow(col, 0); + uiItemR(row, &tex_ptr, "noise_basis_2", UI_ITEM_R_EXPAND, NULL, ICON_NONE); + break; + + case TEX_MAGIC: + uiItemR(col, &tex_ptr, "noise_depth", 0, NULL, ICON_NONE); + break; + + case TEX_STUCCI: + row= uiLayoutRow(col, 0); + uiItemR(row, &tex_ptr, "stucci_type", UI_ITEM_R_EXPAND, NULL, ICON_NONE); + row= uiLayoutRow(col, 0); + uiItemR(row, &tex_ptr, "noise_type", UI_ITEM_R_EXPAND, NULL, ICON_NONE); + uiItemR(col, &tex_ptr, "noise_basis", 0, "", ICON_NONE); break; case TEX_WOOD: uiItemR(col, &tex_ptr, "noise_basis", 0, "", ICON_NONE); uiItemR(col, &tex_ptr, "wood_type", 0, "", ICON_NONE); row= uiLayoutRow(col, 0); - uiItemR(row, &tex_ptr, "noisebasis_2", UI_ITEM_R_EXPAND, NULL, ICON_NONE); + uiItemR(row, &tex_ptr, "noise_basis_2", UI_ITEM_R_EXPAND, NULL, ICON_NONE); row= uiLayoutRow(col, 0); uiLayoutSetActive(row, !(RNA_enum_get(&tex_ptr, "wood_type")==TEX_BAND || RNA_enum_get(&tex_ptr, "wood_type")==TEX_RING)); uiItemR(row, &tex_ptr, "noise_type", UI_ITEM_R_EXPAND, NULL, ICON_NONE); @@ -1253,6 +1267,18 @@ static void node_texture_buts_proc(uiLayout *layout, bContext *UNUSED(C), Pointe uiItemR(col, &tex_ptr, "noise_basis", 0, "", ICON_NONE); uiItemR(col, &tex_ptr, "noise_distortion", 0, "", ICON_NONE); break; + + case TEX_MUSGRAVE: + uiItemR(col, &tex_ptr, "musgrave_type", 0, "", ICON_NONE); + uiItemR(col, &tex_ptr, "noise_basis", 0, "", ICON_NONE); + break; + case TEX_VORONOI: + uiItemR(col, &tex_ptr, "distance_metric", 0, "", ICON_NONE); + if(tex->vn_distm == TEX_MINKOVSKY) { + uiItemR(col, &tex_ptr, "minkovsky_exponent", 0, NULL, ICON_NONE); + } + uiItemR(col, &tex_ptr, "color_mode", 0, "", ICON_NONE); + break; } } diff --git a/source/blender/makesrna/intern/rna_texture.c b/source/blender/makesrna/intern/rna_texture.c index 3ff5150b442..c328e6e184e 100644 --- a/source/blender/makesrna/intern/rna_texture.c +++ b/source/blender/makesrna/intern/rna_texture.c @@ -790,7 +790,7 @@ static void rna_def_texture_wood(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Pattern", ""); RNA_def_property_update(prop, 0, "rna_Texture_nodes_update"); - prop= RNA_def_property(srna, "noisebasis_2", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "noise_basis_2", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "noisebasis2"); RNA_def_property_enum_items(prop, prop_wood_noisebasis2); RNA_def_property_ui_text(prop, "Noise Basis 2", ""); @@ -864,7 +864,7 @@ static void rna_def_texture_marble(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Noise Basis", "Sets the noise basis used for turbulence"); RNA_def_property_update(prop, 0, "rna_Texture_nodes_update"); - prop= RNA_def_property(srna, "noisebasis_2", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "noise_basis_2", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "noisebasis2"); RNA_def_property_enum_items(prop, prop_marble_noisebasis2); RNA_def_property_ui_text(prop, "Noise Basis 2", ""); |