archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

* Small tweaks to texture panels

Browse Source
This commit is contained in:
Matt Ebb
2009-05-26 02:49:46 +00:00
parent 84e919ca4b
commit 61101e560d
2 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
release/ui/buttons_texture.py
View File

@@ -34,8 +34,8 @@ class TEXTURE_PT_clouds(TextureButtonsPanel):
layout.itemR(tex, "stype", expand=True)
layout.itemL(text="Noise:")
layout.itemR(tex, "noise_basis", text="Basis")
layout.itemR(tex, "noise_type", text="Type", expand=True)
layout.itemR(tex, "noise_basis", text="Basis")
col = layout.column_flow()
col.itemR(tex, "noise_size", text="Size")
@@ -54,11 +54,11 @@ class TEXTURE_PT_wood(TextureButtonsPanel):
layout = self.layout
tex = context.active_object.active_material.active_texture.texture
layout.itemR(tex, "noisebasis2", expand=True)
layout.itemR(tex, "stype", expand=True)
layout.itemR(tex, "noisebasis2", expand=True)
layout.itemL(text="Noise:")
layout.itemR(tex, "noise_basis", text="Basis")
layout.itemR(tex, "noise_type", text="Type", expand=True)
layout.itemR(tex, "noise_basis", text="Basis")
col = layout.column_flow()
col.itemR(tex, "noise_size", text="Size")
@@ -80,8 +80,8 @@ class TEXTURE_PT_marble(TextureButtonsPanel):
layout.itemR(tex, "stype", expand=True)
layout.itemR(tex, "noisebasis2", expand=True)
layout.itemL(text="Noise:")
layout.itemR(tex, "noise_basis", text="Basis")
layout.itemR(tex, "noise_type", text="Type", expand=True)
layout.itemR(tex, "noise_basis", text="Basis")
col = layout.column_flow()
col.itemR(tex, "noise_size", text="Size")
@@ -134,8 +134,8 @@ class TEXTURE_PT_stucci(TextureButtonsPanel):
layout.itemR(tex, "stype", expand=True)
layout.itemL(text="Noise:")
layout.itemR(tex, "noise_basis", text="Basis")
layout.itemR(tex, "noise_type", text="Type", expand=True)
layout.itemR(tex, "noise_basis", text="Basis")
row = layout.row()
row.itemR(tex, "noise_size", text="Size")
@@ -251,9 +251,11 @@ class TEXTURE_PT_musgrave(TextureButtonsPanel):
layout = self.layout
tex = context.active_object.active_material.active_texture.texture
layout.itemR(tex, "musgrave_type")
split = layout.split()
sub = split.column()
sub = split.column()
sub.itemR(tex, "highest_dimension", text="Dimension")
sub.itemR(tex, "lacunarity")
sub.itemR(tex, "octaves")
@@ -265,8 +267,8 @@ class TEXTURE_PT_musgrave(TextureButtonsPanel):
sub.itemR(tex, "noise_intensity", text="Intensity")
layout.itemL(text="Noise:")
layout.itemR(tex, "noise_basis", text="Basis")
layout.itemR(tex, "musgrave_type")
row = layout.row()
row.itemR(tex, "noise_size", text="Size")
@@ -286,13 +288,15 @@ class TEXTURE_PT_voronoi(TextureButtonsPanel):
tex = context.active_object.active_material.active_texture.texture
layout.itemR(tex, "distance_metric")
layout.itemR(tex, "color_type")
layout.itemR(tex, "coloring")
split = layout.split()
sub = split.column()
sub.itemR(tex, "minkovsky_exponent", text="Minkovsky")
sub.itemR(tex, "noise_intensity", text="Intensity")
if tex.distance_metric == 'MINKOVSKY':
sub.itemR(tex, "minkovsky_exponent", text="Exponent")
sub = split.column()
sub.itemR(tex, "feature_weights", slider=True)
@@ -317,9 +321,14 @@ class TEXTURE_PT_distortednoise(TextureButtonsPanel):
layout.itemR(tex, "noise_distortion")
layout.itemR(tex, "noise_basis", text="Basis")
row = layout.row()
row.itemR(tex, "noise_size", text="Size")
row.itemR(tex, "nabla")
split = layout.split()
sub = split.column()
sub.itemR(tex, "distortion_amount", text="Amount")
sub.itemR(tex, "noise_size", text="Size")
sub = split.column()
sub.itemR(tex, "nabla")
bpy.types.register(TEXTURE_PT_texture)
bpy.types.register(TEXTURE_PT_clouds)

20
source/blender/makesrna/intern/rna_texture.c
View File

@@ -345,8 +345,8 @@ static EnumPropertyItem prop_noise_basis_items[] = {
{0, NULL, NULL, NULL}};
static EnumPropertyItem prop_noise_type[] = {
{TEX_NOISESOFT, "SOFT_NOISE", "Soft Noise", ""},
{TEX_NOISEPERL, "HARD_NOISE", "Hard Noise", ""},
{TEX_NOISESOFT, "SOFT_NOISE", "Soft", ""},
{TEX_NOISEPERL, "HARD_NOISE", "Hard", ""},
{0, NULL, NULL, NULL}};
@@ -356,7 +356,7 @@ static void rna_def_texture_clouds(BlenderRNA *brna)
PropertyRNA *prop;
static EnumPropertyItem prop_clouds_stype[] = {
{TEX_DEFAULT, "DEFAULT", "Default", ""},
{TEX_DEFAULT, "GREYSCALE", "Greyscale", ""},
{TEX_COLOR, "COLOR", "Color", ""},
{0, NULL, NULL, NULL}};
@@ -406,12 +406,12 @@ static void rna_def_texture_wood(BlenderRNA *brna)
static EnumPropertyItem prop_wood_stype[] = {
{TEX_BAND, "BANDS", "Bands", "Uses standard wood texture in bands"},
{TEX_RING, "RINGS", "Rings", "Uses wood texture in rings"},
{TEX_BANDNOISE, "BANDNOISE", "BandNoise", "Adds noise to standard wood"},
{TEX_RINGNOISE, "RINGNOISE", "RingNoise", "Adds noise to rings"},
{TEX_BANDNOISE, "BANDNOISE", "Band Noise", "Adds noise to standard wood"},
{TEX_RINGNOISE, "RINGNOISE", "Ring Noise", "Adds noise to rings"},
{0, NULL, NULL, NULL}};
static EnumPropertyItem prop_wood_noisebasis2[] = {
{TEX_SIN, "SIN", "Sin", "Uses a sine wave to produce bands"},
{TEX_SIN, "SIN", "Sine", "Uses a sine wave to produce bands"},
{TEX_SAW, "SAW", "Saw", "Uses a saw wave to produce bands"},
{TEX_TRI, "TRI", "Tri", "Uses a triangle wave to produce bands"},
{0, NULL, NULL, NULL}};
@@ -877,7 +877,7 @@ static void rna_def_texture_voronoi(BlenderRNA *brna)
{TEX_MINKOVSKY, "MINKOVSKY", "Minkovsky", ""},
{0, NULL, NULL, NULL}};
static EnumPropertyItem prop_color_type_items[] = {
static EnumPropertyItem prop_coloring_items[] = {
/* XXX: OK names / descriptions? */
{TEX_INTENSITY, "INTENSITY", "Intensity", "Only calculate intensity."},
{TEX_COL1, "POSITION", "Position", "Color cells by position."},
@@ -905,10 +905,10 @@ static void rna_def_texture_voronoi(BlenderRNA *brna)
RNA_def_property_enum_items(prop, prop_distance_metric_items);
RNA_def_property_ui_text(prop, "Distance Metric", "");
prop= RNA_def_property(srna, "color_type", PROP_ENUM, PROP_NONE);
prop= RNA_def_property(srna, "coloring", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "vn_coltype");
RNA_def_property_enum_items(prop, prop_color_type_items);
RNA_def_property_ui_text(prop, "Color Type", "");
RNA_def_property_enum_items(prop, prop_coloring_items);
RNA_def_property_ui_text(prop, "Coloring", "");
prop= RNA_def_property(srna, "noise_intensity", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "ns_outscale");