diff options
| -rw-r--r-- | release/ui/buttons_data_lamp.py | 26 | ||||
| -rw-r--r-- | release/ui/buttons_texture.py | 5 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_lamp.c | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_texture.c | 11 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_world.c | 1 |
5 files changed, 28 insertions, 17 deletions
diff --git a/release/ui/buttons_data_lamp.py b/release/ui/buttons_data_lamp.py index 808a205b1b8..d5aaa5ad679 100644 --- a/release/ui/buttons_data_lamp.py +++ b/release/ui/buttons_data_lamp.py @@ -75,7 +75,7 @@ class DATA_PT_lamp(DataButtonsPanel): col.itemR(lamp, "diffuse") class DATA_PT_sunsky(DataButtonsPanel): - __label__ = "Sun/Sky" + __label__ = "Sky & Atmosphere" def poll(self, context): lamp = context.lamp @@ -86,9 +86,8 @@ class DATA_PT_sunsky(DataButtonsPanel): lamp = context.lamp.sky - row = layout.row() - row.itemR(lamp, "sky") - row.itemR(lamp, "atmosphere") + layout.itemR(lamp, "sky") + row = layout.row() row.active = lamp.sky or lamp.atmosphere @@ -98,38 +97,39 @@ class DATA_PT_sunsky(DataButtonsPanel): col = split.column() col.active = lamp.sky - col.itemL(text="Blend Mode:") - sub = col.column(align=True) + col.itemL(text="Blending:") + sub = col.column() sub.itemR(lamp, "sky_blend_type", text="") sub.itemR(lamp, "sky_blend", text="Factor") col.itemL(text="Color Space:") - sub = col.column(align=True) - sub.itemR(lamp, "sky_color_space", text="") + sub = col.column() + sub.row().itemR(lamp, "sky_color_space", expand=True) sub.itemR(lamp, "sky_exposure", text="Exposure") col = split.column() col.active = lamp.sky col.itemL(text="Horizon:") - sub = col.column(align=True) + sub = col.column() sub.itemR(lamp, "horizon_brightness", text="Brightness") sub.itemR(lamp, "spread", text="Spread") col.itemL(text="Sun:") - sub = col.column(align=True) + sub = col.column() sub.itemR(lamp, "sun_brightness", text="Brightness") sub.itemR(lamp, "sun_size", text="Size") sub.itemR(lamp, "backscattered_light", slider=True,text="Back Light") layout.itemS() + layout.itemR(lamp, "atmosphere") + split = layout.split() col = split.column() col.active = lamp.atmosphere - col.itemL(text="Sun:") - col.itemR(lamp, "sun_intensity", text="Intensity") - col.itemL(text="Scale Distance:") + col.itemL(text="Intensity:") + col.itemR(lamp, "sun_intensity", text="Sun") col.itemR(lamp, "atmosphere_distance_factor", text="Distance") col = split.column() diff --git a/release/ui/buttons_texture.py b/release/ui/buttons_texture.py index 90ce40b4832..3cea47a236e 100644 --- a/release/ui/buttons_texture.py +++ b/release/ui/buttons_texture.py @@ -381,7 +381,10 @@ class TEXTURE_PT_blend(TextureTypePanel): tex = context.texture layout.itemR(tex, "progression") - layout.itemR(tex, "flip_axis") + sub = layout.row() + + sub.active = (tex.progression in ('LINEAR', 'QUADRATIC', 'EASING', 'RADIAL')) + sub.itemR(tex, "flip_axis", expand=True) class TEXTURE_PT_stucci(TextureTypePanel): __label__ = "Stucci" diff --git a/source/blender/makesrna/intern/rna_lamp.c b/source/blender/makesrna/intern/rna_lamp.c index 57aa1ba2736..dc59a75edbc 100644 --- a/source/blender/makesrna/intern/rna_lamp.c +++ b/source/blender/makesrna/intern/rna_lamp.c @@ -431,7 +431,7 @@ static void rna_def_lamp_shadow(StructRNA *srna, int spot, int area) prop= RNA_def_property(srna, "shadow_color", PROP_FLOAT, PROP_COLOR); RNA_def_property_float_sdna(prop, NULL, "shdwr"); RNA_def_property_array(prop, 3); - RNA_def_property_ui_text(prop, "Shadow Color", "Color of shadows casted by the lamp."); + RNA_def_property_ui_text(prop, "Shadow Color", "Color of shadows cast by the lamp."); RNA_def_property_update(prop, NC_LAMP|ND_LIGHTING, NULL); prop= RNA_def_property(srna, "only_shadow", PROP_BOOLEAN, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_texture.c b/source/blender/makesrna/intern/rna_texture.c index f6835f3e7b5..ce65dc37e5b 100644 --- a/source/blender/makesrna/intern/rna_texture.c +++ b/source/blender/makesrna/intern/rna_texture.c @@ -835,6 +835,11 @@ static void rna_def_texture_blend(BlenderRNA *brna) {TEX_RAD, "RADIAL", 0, "Radial", "Creates a radial progression"}, {0, NULL, 0, NULL, NULL}}; + static const EnumPropertyItem prop_flip_axis_items[]= { + {0, "HORIZONTAL", 0, "Horizontal", "Flips the texture's X and Y axis"}, + {TEX_FLIPBLEND, "VERTICAL", 0, "Vertical", "Flips the texture's X and Y axis"}, + {0, NULL, 0, NULL, NULL}}; + srna= RNA_def_struct(brna, "BlendTexture", "Texture"); RNA_def_struct_ui_text(srna, "Blend Texture", "Procedural color blending texture."); RNA_def_struct_sdna(srna, "Tex"); @@ -845,10 +850,12 @@ static void rna_def_texture_blend(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Progression", "Sets the style of the color blending"); RNA_def_property_update(prop, NC_TEXTURE, NULL); - prop= RNA_def_property(srna, "flip_axis", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "flag", TEX_FLIPBLEND); + prop= RNA_def_property(srna, "flip_axis", PROP_ENUM, PROP_NONE); + RNA_def_property_enum_bitflag_sdna(prop, NULL, "flag"); + RNA_def_property_enum_items(prop, prop_flip_axis_items); RNA_def_property_ui_text(prop, "Flip Axis", "Flips the texture's X and Y axis"); RNA_def_property_update(prop, NC_TEXTURE, NULL); + } static void rna_def_texture_stucci(BlenderRNA *brna) diff --git a/source/blender/makesrna/intern/rna_world.c b/source/blender/makesrna/intern/rna_world.c index 0ed5016ccd2..d2eebbc61aa 100644 --- a/source/blender/makesrna/intern/rna_world.c +++ b/source/blender/makesrna/intern/rna_world.c @@ -431,6 +431,7 @@ void RNA_def_world(BlenderRNA *brna) RNA_def_property_float_sdna(prop, NULL, "ambr"); RNA_def_property_array(prop, 3); RNA_def_property_ui_text(prop, "Ambient Color", ""); + RNA_def_property_update(prop, NC_WORLD, NULL); /* exp, range */ prop= RNA_def_property(srna, "exposure", PROP_FLOAT, PROP_NONE); |