diff options
Diffstat (limited to 'release/scripts/ui/properties_texture.py')
| -rw-r--r-- | release/scripts/ui/properties_texture.py | 144 |
1 files changed, 72 insertions, 72 deletions
diff --git a/release/scripts/ui/properties_texture.py b/release/scripts/ui/properties_texture.py index 9f759e24f53..7996e162b8e 100644 --- a/release/scripts/ui/properties_texture.py +++ b/release/scripts/ui/properties_texture.py @@ -228,9 +228,9 @@ class TEXTURE_PT_mapping(TextureSlotPanel, bpy.types.Panel): col = split.column() col.label(text="Coordinates:") col = split.column() - col.prop(tex, "texture_coordinates", text="") + col.prop(tex, "texture_coords", text="") - if tex.texture_coordinates == 'ORCO': + if tex.texture_coords == 'ORCO': """ ob = context.object if ob and ob.type == 'MESH': @@ -238,7 +238,7 @@ class TEXTURE_PT_mapping(TextureSlotPanel, bpy.types.Panel): split.label(text="Mesh:") split.prop(ob.data, "texco_mesh", text="") """ - elif tex.texture_coordinates == 'UV': + elif tex.texture_coords == 'UV': split = layout.split(percentage=0.3) split.label(text="Layer:") ob = context.object @@ -247,7 +247,7 @@ class TEXTURE_PT_mapping(TextureSlotPanel, bpy.types.Panel): else: split.prop(tex, "uv_layer", text="") - elif tex.texture_coordinates == 'OBJECT': + elif tex.texture_coords == 'OBJECT': split = layout.split(percentage=0.3) split.label(text="Object:") split.prop(tex, "object", text="") @@ -269,18 +269,18 @@ class TEXTURE_PT_mapping(TextureSlotPanel, bpy.types.Panel): split = layout.split() col = split.column() - if tex.texture_coordinates in ('ORCO', 'UV'): - col.prop(tex, "from_dupli") - elif tex.texture_coordinates == 'OBJECT': - col.prop(tex, "from_original") + if tex.texture_coords in ('ORCO', 'UV'): + col.prop(tex, "use_from_dupli") + elif tex.texture_coords == 'OBJECT': + col.prop(tex, "use_from_original") else: col.label() col = split.column() row = col.row() - row.prop(tex, "x_mapping", text="") - row.prop(tex, "y_mapping", text="") - row.prop(tex, "z_mapping", text="") + row.prop(tex, "mapping_x", text="") + row.prop(tex, "mapping_y", text="") + row.prop(tex, "mapping_z", text="") split = layout.split() @@ -330,66 +330,66 @@ class TEXTURE_PT_influence(TextureSlotPanel, bpy.types.Panel): col = split.column() col.label(text="Diffuse:") - factor_but(col, tex.map_diffuse, "map_diffuse", "diffuse_factor", "Intensity") - factor_but(col, tex.map_colordiff, "map_colordiff", "colordiff_factor", "Color") - factor_but(col, tex.map_alpha, "map_alpha", "alpha_factor", "Alpha") - factor_but(col, tex.map_translucency, "map_translucency", "translucency_factor", "Translucency") + factor_but(col, tex.use_map_diffuse, "use_map_diffuse", "diffuse_factor", "Intensity") + factor_but(col, tex.use_map_color_diff, "use_map_color_diff", "diffuse_color_factor", "Color") + factor_but(col, tex.use_map_alpha, "use_map_alpha", "alpha_factor", "Alpha") + factor_but(col, tex.use_map_translucency, "use_map_translucency", "translucency_factor", "Translucency") col.label(text="Specular:") - factor_but(col, tex.map_specular, "map_specular", "specular_factor", "Intensity") - factor_but(col, tex.map_colorspec, "map_colorspec", "colorspec_factor", "Color") - factor_but(col, tex.map_hardness, "map_hardness", "hardness_factor", "Hardness") + factor_but(col, tex.use_map_specular, "use_map_specular", "specular_factor", "Intensity") + factor_but(col, tex.use_map_color_spec, "use_map_color_spec", "specular_color_factor", "Color") + factor_but(col, tex.use_map_hardness, "use_map_hardness", "hardness_factor", "Hardness") col = split.column() col.label(text="Shading:") - factor_but(col, tex.map_ambient, "map_ambient", "ambient_factor", "Ambient") - factor_but(col, tex.map_emit, "map_emit", "emit_factor", "Emit") - factor_but(col, tex.map_mirror, "map_mirror", "mirror_factor", "Mirror") - factor_but(col, tex.map_raymir, "map_raymir", "raymir_factor", "Ray Mirror") + factor_but(col, tex.use_map_ambient, "use_map_ambient", "ambient_factor", "Ambient") + factor_but(col, tex.use_map_emit, "use_map_emit", "emit_factor", "Emit") + factor_but(col, tex.use_map_mirror, "use_map_mirror", "mirror_factor", "Mirror") + factor_but(col, tex.use_map_raymir, "use_map_raymir", "raymir_factor", "Ray Mirror") col.label(text="Geometry:") # XXX replace 'or' when displacement is fixed to not rely on normal influence value. - factor_but(col, (tex.map_normal or tex.map_displacement), "map_normal", "normal_factor", "Normal") - factor_but(col, tex.map_warp, "map_warp", "warp_factor", "Warp") - factor_but(col, tex.map_displacement, "map_displacement", "displacement_factor", "Displace") + factor_but(col, (tex.use_map_normal or tex.use_map_displacement), "use_map_normal", "normal_factor", "Normal") + factor_but(col, tex.use_map_warp, "use_map_warp", "warp_factor", "Warp") + factor_but(col, tex.use_map_displacement, "use_map_displacement", "displacement_factor", "Displace") #sub = col.column() - #sub.active = tex.map_translucency or tex.map_emit or tex.map_alpha or tex.map_raymir or tex.map_hardness or tex.map_ambient or tex.map_specularity or tex.map_reflection or tex.map_mirror + #sub.active = tex.use_map_translucency or tex.map_emit or tex.map_alpha or tex.map_raymir or tex.map_hardness or tex.map_ambient or tex.map_specularity or tex.map_reflection or tex.map_mirror #sub.prop(tex, "default_value", text="Amount", slider=True) elif idblock.type == 'VOLUME': split = layout.split() col = split.column() - factor_but(col, tex.map_density, "map_density", "density_factor", "Density") - factor_but(col, tex.map_emission, "map_emission", "emission_factor", "Emission") - factor_but(col, tex.map_scattering, "map_scattering", "scattering_factor", "Scattering") - factor_but(col, tex.map_reflection, "map_reflection", "reflection_factor", "Reflection") + factor_but(col, tex.use_map_density, "use_map_density", "density_factor", "Density") + factor_but(col, tex.use_map_emission, "use_map_emission", "emission_factor", "Emission") + factor_but(col, tex.use_map_scatter, "use_map_scattering", "scattering_factor", "Scattering") + factor_but(col, tex.use_map_reflect, "use_map_reflection", "reflection_factor", "Reflection") col = split.column() col.label(text=" ") - factor_but(col, tex.map_coloremission, "map_coloremission", "coloremission_factor", "Emission Color") - factor_but(col, tex.map_colortransmission, "map_colortransmission", "colortransmission_factor", "Transmission Color") - factor_but(col, tex.map_colorreflection, "map_colorreflection", "colorreflection_factor", "Reflection Color") + factor_but(col, tex.use_map_color_emission, "use_map_color_emission", "emission_color_factor", "Emission Color") + factor_but(col, tex.use_map_color_transmission, "use_map_color_transmission", "transmission_color_factor", "Transmission Color") + factor_but(col, tex.use_map_color_reflection, "use_map_color_reflection", "reflection_color_factor", "Reflection Color") elif type(idblock) == bpy.types.Lamp: split = layout.split() col = split.column() - factor_but(col, tex.map_color, "map_color", "color_factor", "Color") + factor_but(col, tex.use_map_color, "map_color", "color_factor", "Color") col = split.column() - factor_but(col, tex.map_shadow, "map_shadow", "shadow_factor", "Shadow") + factor_but(col, tex.use_map_shadow, "map_shadow", "shadow_factor", "Shadow") elif type(idblock) == bpy.types.World: split = layout.split() col = split.column() - factor_but(col, tex.map_blend, "map_blend", "blend_factor", "Blend") - factor_but(col, tex.map_horizon, "map_horizon", "horizon_factor", "Horizon") + factor_but(col, tex.use_map_blend, "map_blend", "blend_factor", "Blend") + factor_but(col, tex.use_map_horizon, "map_horizon", "horizon_factor", "Horizon") col = split.column() - factor_but(col, tex.map_zenith_up, "map_zenith_up", "zenith_up_factor", "Zenith Up") - factor_but(col, tex.map_zenith_down, "map_zenith_down", "zenith_down_factor", "Zenith Down") + factor_but(col, tex.use_map_zenith_up, "map_zenith_up", "zenith_up_factor", "Zenith Up") + factor_but(col, tex.use_map_zenith_down, "map_zenith_down", "zenith_down_factor", "Zenith Down") layout.separator() @@ -397,14 +397,14 @@ class TEXTURE_PT_influence(TextureSlotPanel, bpy.types.Panel): col = split.column() col.prop(tex, "blend_type", text="Blend") - col.prop(tex, "rgb_to_intensity") + col.prop(tex, "use_rgb_to_intensity") sub = col.column() - sub.active = tex.rgb_to_intensity + sub.active = tex.use_rgb_to_intensity sub.prop(tex, "color", text="") col = split.column() col.prop(tex, "negate", text="Negative") - col.prop(tex, "stencil") + col.prop(tex, "use_stencil") if type(idblock) in (bpy.types.Material, bpy.types.World): col.prop(tex, "default_value", text="DVar", slider=True) @@ -439,7 +439,7 @@ class TEXTURE_PT_clouds(TextureTypePanel, bpy.types.Panel): split = layout.split() col = split.column() - col.prop(tex, "noise_size", text="Size") + col.prop(tex, "noise_scale", text="Size") col.prop(tex, "noise_depth", text="Depth") col = split.column() @@ -456,7 +456,7 @@ class TEXTURE_PT_wood(TextureTypePanel, bpy.types.Panel): tex = context.texture - layout.prop(tex, "noisebasis2", expand=True) + layout.prop(tex, "noisebasis_2", expand=True) layout.prop(tex, "stype", expand=True) col = layout.column() @@ -469,7 +469,7 @@ class TEXTURE_PT_wood(TextureTypePanel, bpy.types.Panel): split.active = tex.stype in ('RINGNOISE', 'BANDNOISE') col = split.column() - col.prop(tex, "noise_size", text="Size") + col.prop(tex, "noise_scale", text="Size") col.prop(tex, "turbulence") col = split.column() @@ -487,7 +487,7 @@ class TEXTURE_PT_marble(TextureTypePanel, bpy.types.Panel): tex = context.texture layout.prop(tex, "stype", expand=True) - layout.prop(tex, "noisebasis2", expand=True) + layout.prop(tex, "noisebasis_2", expand=True) layout.label(text="Noise:") layout.prop(tex, "noise_type", text="Type", expand=True) layout.prop(tex, "noise_basis", text="Basis") @@ -495,7 +495,7 @@ class TEXTURE_PT_marble(TextureTypePanel, bpy.types.Panel): split = layout.split() col = split.column() - col.prop(tex, "noise_size", text="Size") + col.prop(tex, "noise_scale", text="Size") col.prop(tex, "noise_depth", text="Depth") col = split.column() @@ -537,7 +537,7 @@ class TEXTURE_PT_blend(TextureTypePanel, bpy.types.Panel): sub = layout.row() sub.active = (tex.progression in ('LINEAR', 'QUADRATIC', 'EASING', 'RADIAL')) - sub.prop(tex, "flip_axis", expand=True) + sub.prop(tex, "use_flip_axis", expand=True) class TEXTURE_PT_stucci(TextureTypePanel, bpy.types.Panel): @@ -558,7 +558,7 @@ class TEXTURE_PT_stucci(TextureTypePanel, bpy.types.Panel): split = layout.split() col = split.column() - col.prop(tex, "noise_size", text="Size") + col.prop(tex, "noise_scale", text="Size") col = split.column() col.prop(tex, "turbulence") @@ -587,7 +587,7 @@ def texture_filter_common(tex, layout): layout.prop(tex, "filter_eccentricity", text="Eccentricity") layout.prop(tex, "filter_size") - layout.prop(tex, "filter_size_minimum") + layout.prop(tex, "use_filter_size_min") class TEXTURE_PT_image_sampling(TextureTypePanel, bpy.types.Panel): @@ -607,22 +607,22 @@ class TEXTURE_PT_image_sampling(TextureTypePanel, bpy.types.Panel): col = split.column() col.label(text="Alpha:") col.prop(tex, "use_alpha", text="Use") - col.prop(tex, "calculate_alpha", text="Calculate") + col.prop(tex, "use_calculate_alpha", text="Calculate") col.prop(tex, "invert_alpha", text="Invert") col.separator() - col.prop(tex, "flip_axis", text="Flip X/Y Axis") + col.prop(tex, "use_flip_axis", text="Flip X/Y Axis") col = split.column() - col.prop(tex, "normal_map") + col.prop(tex, "use_normal_map") row = col.row() - row.active = tex.normal_map + row.active = tex.use_normal_map row.prop(tex, "normal_space", text="") col.prop(tex, "mipmap") row = col.row() row.active = tex.mipmap - row.prop(tex, "mipmap_gauss") + row.prop(tex, "use_mipmap_gauss") col.prop(tex, "interpolation") texture_filter_common(tex, col) @@ -651,15 +651,15 @@ class TEXTURE_PT_image_mapping(TextureTypePanel, bpy.types.Panel): col = split.column(align=True) col.label(text="Mirror:") - col.prop(tex, "mirror_x", text="X") - col.prop(tex, "mirror_y", text="Y") + col.prop(tex, "use_mirror_x", text="X") + col.prop(tex, "use_mirror_y", text="Y") layout.separator() elif tex.extension == 'CHECKER': col = split.column(align=True) row = col.row() - row.prop(tex, "checker_even", text="Even") - row.prop(tex, "checker_odd", text="Odd") + row.prop(tex, "use_checker_even", text="Even") + row.prop(tex, "use_checker_odd", text="Odd") col = split.column() col.prop(tex, "checker_distance", text="Distance") @@ -748,7 +748,7 @@ class TEXTURE_PT_musgrave(TextureTypePanel, bpy.types.Panel): split = layout.split() col = split.column() - col.prop(tex, "highest_dimension", text="Dimension") + col.prop(tex, "dimension_max", text="Dimension") col.prop(tex, "lacunarity") col.prop(tex, "octaves") @@ -766,7 +766,7 @@ class TEXTURE_PT_musgrave(TextureTypePanel, bpy.types.Panel): split = layout.split() col = split.column() - col.prop(tex, "noise_size", text="Size") + col.prop(tex, "noise_scale", text="Size") col = split.column() col.prop(tex, "nabla") @@ -791,7 +791,7 @@ class TEXTURE_PT_voronoi(TextureTypePanel, bpy.types.Panel): sub.active = tex.distance_metric == 'MINKOVSKY' sub.prop(tex, "minkovsky_exponent", text="Exponent") col.label(text="Coloring:") - col.prop(tex, "coloring", text="") + col.prop(tex, "color_mode", text="") col.prop(tex, "noise_intensity", text="Intensity") col = split.column() @@ -807,7 +807,7 @@ class TEXTURE_PT_voronoi(TextureTypePanel, bpy.types.Panel): split = layout.split() col = split.column() - col.prop(tex, "noise_size", text="Size") + col.prop(tex, "noise_scale", text="Size") col = split.column() col.prop(tex, "nabla") @@ -830,7 +830,7 @@ class TEXTURE_PT_distortednoise(TextureTypePanel, bpy.types.Panel): col = split.column() col.prop(tex, "distortion", text="Distortion") - col.prop(tex, "noise_size", text="Size") + col.prop(tex, "noise_scale", text="Size") col = split.column() col.prop(tex, "nabla") @@ -854,7 +854,7 @@ class TEXTURE_PT_voxeldata(TextureButtonsPanel, bpy.types.Panel): layout.prop(vd, "file_format") if vd.file_format in ('BLENDER_VOXEL', 'RAW_8BIT'): - layout.prop(vd, "source_path") + layout.prop(vd, "filepath") if vd.file_format == 'RAW_8BIT': layout.prop(vd, "resolution") elif vd.file_format == 'SMOKE': @@ -868,7 +868,7 @@ class TEXTURE_PT_voxeldata(TextureButtonsPanel, bpy.types.Panel): layout.prop(vd, "still") row = layout.row() row.active = vd.still - row.prop(vd, "still_frame_number") + row.prop(vd, "still_frame") layout.prop(vd, "interpolation") layout.prop(vd, "extension") @@ -906,12 +906,12 @@ class TEXTURE_PT_pointdensity(TextureButtonsPanel, bpy.types.Panel): sub.label(text="System:") sub.prop_object(pd, "particle_system", pd.object, "particle_systems", text="") sub.label(text="Cache:") - sub.prop(pd, "particle_cache", text="") + sub.prop(pd, "particle_cache_space", text="") else: col.label(text="Object:") col.prop(pd, "object", text="") col.label(text="Cache:") - col.prop(pd, "vertices_cache", text="") + col.prop(pd, "vertex_cache_space", text="") col.separator() @@ -928,7 +928,7 @@ class TEXTURE_PT_pointdensity(TextureButtonsPanel, bpy.types.Panel): col.label(text="Falloff:") col.prop(pd, "falloff", text="") if pd.falloff == 'SOFT': - col.prop(pd, "falloff_softness") + col.prop(pd, "falloff_soft") class TEXTURE_PT_pointdensity_turbulence(TextureButtonsPanel, bpy.types.Panel): @@ -947,14 +947,14 @@ class TEXTURE_PT_pointdensity_turbulence(TextureButtonsPanel, bpy.types.Panel): tex = context.texture pd = tex.point_density - layout.prop(pd, "turbulence", text="") + layout.prop(pd, "use_turbulence", text="") def draw(self, context): layout = self.layout tex = context.texture pd = tex.point_density - layout.active = pd.turbulence + layout.active = pd.use_turbulence split = layout.split() @@ -966,7 +966,7 @@ class TEXTURE_PT_pointdensity_turbulence(TextureButtonsPanel, bpy.types.Panel): col = split.column() col.label() - col.prop(pd, "turbulence_size") + col.prop(pd, "turbulence_scale") col.prop(pd, "turbulence_depth") col.prop(pd, "turbulence_strength") |