Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

remove use of gettext: _("...") style translation now its handled by rna.

Browse Source
This commit is contained in:
Campbell Barton
2011-09-21 15:18:38 +00:00
parent ae0124157f
commit f4c56a879d
40 changed files with 1963 additions and 2004 deletions
Download Patch File Download Diff File Expand all files Collapse all files

267
release/scripts/startup/bl_ui/properties_texture.py
View File

@@ -20,7 +20,6 @@
import bpy
from bpy.types import Menu, Panel
from rna_prop_ui import PropertyPanel
from blf import gettext as _
class TEXTURE_MT_specials(Menu):
@@ -144,11 +143,11 @@ class TEXTURE_PT_context_texture(TextureButtonsPanel, Panel):
if tex.use_nodes:
if slot:
split.label(text=_("Output:"))
split.label(text="Output:")
split.prop(slot, "output_node", text="")
else:
split.label(text=_("Type:"))
split.label(text="Type:")
split.prop(tex, "type", text="")
@@ -179,21 +178,21 @@ class TEXTURE_PT_colors(TextureButtonsPanel, Panel):
tex = context.texture
layout.prop(tex, "use_color_ramp", text=_("Ramp"))
layout.prop(tex, "use_color_ramp", text="Ramp")
if tex.use_color_ramp:
layout.template_color_ramp(tex, "color_ramp", expand=True)
split = layout.split()
col = split.column()
col.label(text=_("RGB Multiply:"))
col.label(text="RGB Multiply:")
sub = col.column(align=True)
sub.prop(tex, "factor_red", text="R")
sub.prop(tex, "factor_green", text="G")
sub.prop(tex, "factor_blue", text="B")
col = split.column()
col.label(text=_("Adjust:"))
col.label(text="Adjust:")
col.prop(tex, "intensity")
col.prop(tex, "contrast")
col.prop(tex, "saturation")
@@ -236,17 +235,17 @@ class TEXTURE_PT_clouds(TextureTypePanel, Panel):
tex = context.texture
layout.prop(tex, "cloud_type", expand=True)
layout.label(text=_("Noise:"))
layout.prop(tex, "noise_type", text=_("Type"), expand=True)
layout.prop(tex, "noise_basis", text=_("Basis"))
layout.label(text="Noise:")
layout.prop(tex, "noise_type", text="Type", expand=True)
layout.prop(tex, "noise_basis", text="Basis")
split = layout.split()
col = split.column()
col.prop(tex, "noise_scale", text=_("Size"))
col.prop(tex, "noise_depth", text=_("Depth"))
col.prop(tex, "noise_scale", text="Size")
col.prop(tex, "noise_depth", text="Depth")
split.prop(tex, "nabla", text=_("Nabla"))
split.prop(tex, "nabla", text="Nabla")
class TEXTURE_PT_wood(TextureTypePanel, Panel):
@@ -264,15 +263,15 @@ class TEXTURE_PT_wood(TextureTypePanel, Panel):
col = layout.column()
col.active = tex.wood_type in {'RINGNOISE', 'BANDNOISE'}
col.label(text=_("Noise:"))
col.row().prop(tex, "noise_type", text=_("Type"), expand=True)
layout.prop(tex, "noise_basis", text=_("Basis"))
col.label(text="Noise:")
col.row().prop(tex, "noise_type", text="Type", expand=True)
layout.prop(tex, "noise_basis", text="Basis")
split = layout.split()
split.active = tex.wood_type in {'RINGNOISE', 'BANDNOISE'}
col = split.column()
col.prop(tex, "noise_scale", text=_("Size"))
col.prop(tex, "noise_scale", text="Size")
col.prop(tex, "turbulence")
split.prop(tex, "nabla")
@@ -290,15 +289,15 @@ class TEXTURE_PT_marble(TextureTypePanel, Panel):
layout.prop(tex, "marble_type", expand=True)
layout.prop(tex, "noise_basis_2", expand=True)
layout.label(text=_("Noise:"))
layout.prop(tex, "noise_type", text=_("Type"), expand=True)
layout.prop(tex, "noise_basis", text=_("Basis"))
layout.label(text="Noise:")
layout.prop(tex, "noise_type", text="Type", expand=True)
layout.prop(tex, "noise_basis", text="Basis")
split = layout.split()
col = split.column()
col.prop(tex, "noise_scale", text=_("Size"))
col.prop(tex, "noise_depth", text=_("Depth"))
col.prop(tex, "noise_scale", text="Size")
col.prop(tex, "noise_depth", text="Depth")
col = split.column()
col.prop(tex, "turbulence")
@@ -316,7 +315,7 @@ class TEXTURE_PT_magic(TextureTypePanel, Panel):
tex = context.texture
row = layout.row()
row.prop(tex, "noise_depth", text=_("Depth"))
row.prop(tex, "noise_depth", text="Depth")
row.prop(tex, "turbulence")
@@ -349,12 +348,12 @@ class TEXTURE_PT_stucci(TextureTypePanel, Panel):
tex = context.texture
layout.prop(tex, "stucci_type", expand=True)
layout.label(text=_("Noise:"))
layout.prop(tex, "noise_type", text=_("Type"), expand=True)
layout.prop(tex, "noise_basis", text=_("Basis"))
layout.label(text="Noise:")
layout.prop(tex, "noise_type", text="Type", expand=True)
layout.prop(tex, "noise_basis", text="Basis")
row = layout.row()
row.prop(tex, "noise_scale", text=_("Size"))
row.prop(tex, "noise_scale", text="Size")
row.prop(tex, "turbulence")
@@ -372,13 +371,13 @@ class TEXTURE_PT_image(TextureTypePanel, Panel):
def texture_filter_common(tex, layout):
layout.label(text=_("Filter:"))
layout.label(text="Filter:")
layout.prop(tex, "filter_type", text="")
if tex.use_mipmap and tex.filter_type in {'AREA', 'EWA', 'FELINE'}:
if tex.filter_type == 'FELINE':
layout.prop(tex, "filter_probes", text=_("Probes"))
layout.prop(tex, "filter_probes", text="Probes")
else:
layout.prop(tex, "filter_eccentricity", text=_("Eccentricity"))
layout.prop(tex, "filter_eccentricity", text="Eccentricity")
layout.prop(tex, "filter_size")
layout.prop(tex, "use_filter_size_min")
@@ -400,12 +399,12 @@ class TEXTURE_PT_image_sampling(TextureTypePanel, Panel):
split = layout.split()
col = split.column()
col.label(text=_("Alpha:"))
col.prop(tex, "use_alpha", text=_("Use"))
col.prop(tex, "use_calculate_alpha", text=_("Calculate"))
col.prop(tex, "invert_alpha", text=_("Invert"))
col.label(text="Alpha:")
col.prop(tex, "use_alpha", text="Use")
col.prop(tex, "use_calculate_alpha", text="Calculate")
col.prop(tex, "invert_alpha", text="Invert")
col.separator()
col.prop(tex, "use_flip_axis", text=_("Flip X/Y Axis"))
col.prop(tex, "use_flip_axis", text="Flip X/Y Axis")
col = split.column()
@@ -446,12 +445,12 @@ class TEXTURE_PT_image_mapping(TextureTypePanel, Panel):
if tex.extension == 'REPEAT':
col = split.column(align=True)
col.label(text=_("Repeat:"))
col.label(text="Repeat:")
col.prop(tex, "repeat_x", text="X")
col.prop(tex, "repeat_y", text="Y")
col = split.column(align=True)
col.label(text=_("Mirror:"))
col.label(text="Mirror:")
row = col.row()
row.prop(tex, "use_mirror_x", text="X")
row.active = (tex.repeat_x > 1)
@@ -463,11 +462,11 @@ class TEXTURE_PT_image_mapping(TextureTypePanel, Panel):
elif tex.extension == 'CHECKER':
col = split.column(align=True)
row = col.row()
row.prop(tex, "use_checker_even", text=_("Even"))
row.prop(tex, "use_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"))
col.prop(tex, "checker_distance", text="Distance")
layout.separator()
@@ -475,12 +474,12 @@ class TEXTURE_PT_image_mapping(TextureTypePanel, Panel):
col = split.column(align=True)
#col.prop(tex, "crop_rectangle")
col.label(text=_("Crop Minimum:"))
col.label(text="Crop Minimum:")
col.prop(tex, "crop_min_x", text="X")
col.prop(tex, "crop_min_y", text="Y")
col = split.column(align=True)
col.label(text=_("Crop Maximum:"))
col.label(text="Crop Maximum:")
col.prop(tex, "crop_max_x", text="X")
col.prop(tex, "crop_max_y", text="Y")
@@ -518,9 +517,9 @@ class TEXTURE_PT_envmap(TextureTypePanel, Panel):
col = split.column(align=True)
col.label(text=_("Clipping:"))
col.prop(env, "clip_start", text=_("Start"))
col.prop(env, "clip_end", text=_("End"))
col.label(text="Clipping:")
col.prop(env, "clip_start", text="Start")
col.prop(env, "clip_end", text="End")
class TEXTURE_PT_envmap_sampling(TextureTypePanel, Panel):
@@ -552,7 +551,7 @@ class TEXTURE_PT_musgrave(TextureTypePanel, Panel):
split = layout.split()
col = split.column()
col.prop(tex, "dimension_max", text=_("Dimension"))
col.prop(tex, "dimension_max", text="Dimension")
col.prop(tex, "lacunarity")
col.prop(tex, "octaves")
@@ -561,16 +560,16 @@ class TEXTURE_PT_musgrave(TextureTypePanel, Panel):
if musgrave_type in {'HETERO_TERRAIN', 'RIDGED_MULTIFRACTAL', 'HYBRID_MULTIFRACTAL'}:
col.prop(tex, "offset")
if musgrave_type in {'MULTIFRACTAL', 'RIDGED_MULTIFRACTAL', 'HYBRID_MULTIFRACTAL'}:
col.prop(tex, "noise_intensity", text=_("Intensity"))
col.prop(tex, "noise_intensity", text="Intensity")
if musgrave_type in {'RIDGED_MULTIFRACTAL', 'HYBRID_MULTIFRACTAL'}:
col.prop(tex, "gain")
layout.label(text=_("Noise:"))
layout.label(text="Noise:")
layout.prop(tex, "noise_basis", text=_("Basis"))
layout.prop(tex, "noise_basis", text="Basis")
row = layout.row()
row.prop(tex, "noise_scale", text=_("Size"))
row.prop(tex, "noise_scale", text="Size")
row.prop(tex, "nabla")
@@ -587,26 +586,26 @@ class TEXTURE_PT_voronoi(TextureTypePanel, Panel):
split = layout.split()
col = split.column()
col.label(text=_("Distance Metric:"))
col.label(text="Distance Metric:")
col.prop(tex, "distance_metric", text="")
sub = col.column()
sub.active = tex.distance_metric == 'MINKOVSKY'
sub.prop(tex, "minkovsky_exponent", text=_("Exponent"))
col.label(text=_("Coloring:"))
sub.prop(tex, "minkovsky_exponent", text="Exponent")
col.label(text="Coloring:")
col.prop(tex, "color_mode", text="")
col.prop(tex, "noise_intensity", text=_("Intensity"))
col.prop(tex, "noise_intensity", text="Intensity")
col = split.column()
sub = col.column(align=True)
sub.label(text=_("Feature Weights:"))
sub.label(text="Feature Weights:")
sub.prop(tex, "weight_1", text="1", slider=True)
sub.prop(tex, "weight_2", text="2", slider=True)
sub.prop(tex, "weight_3", text="3", slider=True)
sub.prop(tex, "weight_4", text="4", slider=True)
layout.label(text=_("Noise:"))
layout.label(text="Noise:")
row = layout.row()
row.prop(tex, "noise_scale", text=_("Size"))
row.prop(tex, "noise_scale", text="Size")
row.prop(tex, "nabla")
@@ -621,13 +620,13 @@ class TEXTURE_PT_distortednoise(TextureTypePanel, Panel):
tex = context.texture
layout.prop(tex, "noise_distortion")
layout.prop(tex, "noise_basis", text=_("Basis"))
layout.prop(tex, "noise_basis", text="Basis")
split = layout.split()
col = split.column()
col.prop(tex, "distortion", text=_("Distortion"))
col.prop(tex, "noise_scale", text=_("Size"))
col.prop(tex, "distortion", text="Distortion")
col.prop(tex, "noise_scale", text="Size")
split.prop(tex, "nabla")
@@ -694,26 +693,26 @@ class TEXTURE_PT_pointdensity(TextureButtonsPanel, Panel):
col = split.column()
if pd.point_source == 'PARTICLE_SYSTEM':
col.label(text=_("Object:"))
col.label(text="Object:")
col.prop(pd, "object", text="")
sub = col.column()
sub.enabled = bool(pd.object)
if pd.object:
sub.label(text=_("System:"))
sub.label(text="System:")
sub.prop_search(pd, "particle_system", pd.object, "particle_systems", text="")
sub.label(text=_("Cache:"))
sub.label(text="Cache:")
sub.prop(pd, "particle_cache_space", text="")
else:
col.label(text=_("Object:"))
col.label(text="Object:")
col.prop(pd, "object", text="")
col.label(text=_("Cache:"))
col.label(text="Cache:")
col.prop(pd, "vertex_cache_space", text="")
col.separator()
if pd.point_source == 'PARTICLE_SYSTEM':
col.label(text=_("Color Source:"))
col.label(text="Color Source:")
col.prop(pd, "color_source", text="")
if pd.color_source in {'PARTICLE_SPEED', 'PARTICLE_VELOCITY'}:
col.prop(pd, "speed_scale")
@@ -723,7 +722,7 @@ class TEXTURE_PT_pointdensity(TextureButtonsPanel, Panel):
col = split.column()
col.label()
col.prop(pd, "radius")
col.label(text=_("Falloff:"))
col.label(text="Falloff:")
col.prop(pd, "falloff", text="")
if pd.falloff == 'SOFT':
col.prop(pd, "falloff_soft")
@@ -734,7 +733,7 @@ class TEXTURE_PT_pointdensity(TextureButtonsPanel, Panel):
if pd.use_falloff_curve:
col = layout.column()
col.label(text=_("Falloff Curve"))
col.label(text="Falloff Curve")
col.template_curve_mapping(pd, "falloff_curve", brush=False)
@@ -763,9 +762,9 @@ class TEXTURE_PT_pointdensity_turbulence(TextureButtonsPanel, Panel):
split = layout.split()
col = split.column()
col.label(text=_("Influence:"))
col.label(text="Influence:")
col.prop(pd, "turbulence_influence", text="")
col.label(text=_("Noise Basis:"))
col.label(text="Noise Basis:")
col.prop(pd, "noise_basis", text="")
col = split.column()
@@ -802,7 +801,7 @@ class TEXTURE_PT_mapping(TextureSlotPanel, Panel):
if not isinstance(idblock, bpy.types.Brush):
split = layout.split(percentage=0.3)
col = split.column()
col.label(text=_("Coordinates:"))
col.label(text="Coordinates:")
col = split.column()
col.prop(tex, "texture_coords", text="")
@@ -811,12 +810,12 @@ class TEXTURE_PT_mapping(TextureSlotPanel, Panel):
ob = context.object
if ob and ob.type == 'MESH':
split = layout.split(percentage=0.3)
split.label(text=_("Mesh:"))
split.label(text="Mesh:")
split.prop(ob.data, "texco_mesh", text="")
"""
elif tex.texture_coords == 'UV':
split = layout.split(percentage=0.3)
split.label(text=_("Layer:"))
split.label(text="Layer:")
ob = context.object
if ob and ob.type == 'MESH':
split.prop_search(tex, "uv_layer", ob.data, "uv_textures", text="")
@@ -825,12 +824,12 @@ class TEXTURE_PT_mapping(TextureSlotPanel, Panel):
elif tex.texture_coords == 'OBJECT':
split = layout.split(percentage=0.3)
split.label(text=_("Object:"))
split.label(text="Object:")
split.prop(tex, "object", text="")
if isinstance(idblock, bpy.types.Brush):
if context.sculpt_object:
layout.label(text=_("Brush Mapping:"))
layout.label(text="Brush Mapping:")
layout.prop(tex, "map_mode", expand=True)
row = layout.row()
@@ -839,7 +838,7 @@ class TEXTURE_PT_mapping(TextureSlotPanel, Panel):
else:
if isinstance(idblock, bpy.types.Material):
split = layout.split(percentage=0.3)
split.label(text=_("Projection:"))
split.label(text="Projection:")
split.prop(tex, "mapping", text="")
split = layout.split()
@@ -901,111 +900,111 @@ class TEXTURE_PT_influence(TextureSlotPanel, Panel):
split = layout.split()
col = split.column()
col.label(text=_("Diffuse:"))
factor_but(col, "use_map_diffuse", "diffuse_factor", _("Intensity"))
factor_but(col, "use_map_color_diffuse", "diffuse_color_factor", _("Color"))
factor_but(col, "use_map_alpha", "alpha_factor", _("Alpha"))
factor_but(col, "use_map_translucency", "translucency_factor", _("Translucency"))
col.label(text="Diffuse:")
factor_but(col, "use_map_diffuse", "diffuse_factor", "Intensity")
factor_but(col, "use_map_color_diffuse", "diffuse_color_factor", "Color")
factor_but(col, "use_map_alpha", "alpha_factor", "Alpha")
factor_but(col, "use_map_translucency", "translucency_factor", "Translucency")
col.label(text=_("Specular:"))
factor_but(col, "use_map_specular", "specular_factor", _("Intensity"))
factor_but(col, "use_map_color_spec", "specular_color_factor", _("Color"))
factor_but(col, "use_map_hardness", "hardness_factor", _("Hardness"))
col.label(text="Specular:")
factor_but(col, "use_map_specular", "specular_factor", "Intensity")
factor_but(col, "use_map_color_spec", "specular_color_factor", "Color")
factor_but(col, "use_map_hardness", "hardness_factor", "Hardness")
col = split.column()
col.label(text=_("Shading:"))
factor_but(col, "use_map_ambient", "ambient_factor", _("Ambient"))
factor_but(col, "use_map_emit", "emit_factor", _("Emit"))
factor_but(col, "use_map_mirror", "mirror_factor", _("Mirror"))
factor_but(col, "use_map_raymir", "raymir_factor", _("Ray Mirror"))
col.label(text="Shading:")
factor_but(col, "use_map_ambient", "ambient_factor", "Ambient")
factor_but(col, "use_map_emit", "emit_factor", "Emit")
factor_but(col, "use_map_mirror", "mirror_factor", "Mirror")
factor_but(col, "use_map_raymir", "raymir_factor", "Ray Mirror")
col.label(text=_("Geometry:"))
col.label(text="Geometry:")
# XXX replace 'or' when displacement is fixed to not rely on normal influence value.
sub_tmp = factor_but(col, "use_map_normal", "normal_factor", _("Normal"))
sub_tmp = factor_but(col, "use_map_normal", "normal_factor", "Normal")
sub_tmp.active = (tex.use_map_normal or tex.use_map_displacement)
# END XXX
factor_but(col, "use_map_warp", "warp_factor", _("Warp"))
factor_but(col, "use_map_displacement", "displacement_factor", _("Displace"))
factor_but(col, "use_map_warp", "warp_factor", "Warp")
factor_but(col, "use_map_displacement", "displacement_factor", "Displace")
#sub = col.column()
#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)
#sub.prop(tex, "default_value", text="Amount", slider=True)
elif idblock.type == 'HALO':
layout.label(text=_("Halo:"))
layout.label(text="Halo:")
split = layout.split()
col = split.column()
factor_but(col, "use_map_color_diffuse", "diffuse_color_factor", _("Color"))
factor_but(col, "use_map_alpha", "alpha_factor", _("Alpha"))
factor_but(col, "use_map_color_diffuse", "diffuse_color_factor", "Color")
factor_but(col, "use_map_alpha", "alpha_factor", "Alpha")
col = split.column()
factor_but(col, "use_map_raymir", "raymir_factor", _("Size"))
factor_but(col, "use_map_hardness", "hardness_factor", _("Hardness"))
factor_but(col, "use_map_translucency", "translucency_factor", _("Add"))
factor_but(col, "use_map_raymir", "raymir_factor", "Size")
factor_but(col, "use_map_hardness", "hardness_factor", "Hardness")
factor_but(col, "use_map_translucency", "translucency_factor", "Add")
elif idblock.type == 'VOLUME':
split = layout.split()
col = split.column()
factor_but(col, "use_map_density", "density_factor", _("Density"))
factor_but(col, "use_map_emission", "emission_factor", _("Emission"))
factor_but(col, "use_map_scatter", "scattering_factor", _("Scattering"))
factor_but(col, "use_map_reflect", "reflection_factor", _("Reflection"))
factor_but(col, "use_map_density", "density_factor", "Density")
factor_but(col, "use_map_emission", "emission_factor", "Emission")
factor_but(col, "use_map_scatter", "scattering_factor", "Scattering")
factor_but(col, "use_map_reflect", "reflection_factor", "Reflection")
col = split.column()
col.label(text=" ")
factor_but(col, "use_map_color_emission", "emission_color_factor", _("Emission Color"))
factor_but(col, "use_map_color_transmission", "transmission_color_factor", _("Transmission Color"))
factor_but(col, "use_map_color_reflection", "reflection_color_factor", _("Reflection Color"))
factor_but(col, "use_map_color_emission", "emission_color_factor", "Emission Color")
factor_but(col, "use_map_color_transmission", "transmission_color_factor", "Transmission Color")
factor_but(col, "use_map_color_reflection", "reflection_color_factor", "Reflection Color")
elif isinstance(idblock, bpy.types.Lamp):
split = layout.split()
col = split.column()
factor_but(col, "use_map_color", "color_factor", _("Color"))
factor_but(col, "use_map_color", "color_factor", "Color")
col = split.column()
factor_but(col, "use_map_shadow", "shadow_factor", _("Shadow"))
factor_but(col, "use_map_shadow", "shadow_factor", "Shadow")
elif isinstance(idblock, bpy.types.World):
split = layout.split()
col = split.column()
factor_but(col, "use_map_blend", "blend_factor", _("Blend"))
factor_but(col, "use_map_horizon", "horizon_factor", _("Horizon"))
factor_but(col, "use_map_blend", "blend_factor", "Blend")
factor_but(col, "use_map_horizon", "horizon_factor", "Horizon")
col = split.column()
factor_but(col, "use_map_zenith_up", "zenith_up_factor", _("Zenith Up"))
factor_but(col, "use_map_zenith_down", "zenith_down_factor", _("Zenith Down"))
factor_but(col, "use_map_zenith_up", "zenith_up_factor", "Zenith Up")
factor_but(col, "use_map_zenith_down", "zenith_down_factor", "Zenith Down")
elif isinstance(idblock, bpy.types.ParticleSettings):
split = layout.split()
col = split.column()
col.label(text=_("General:"))
factor_but(col, "use_map_time", "time_factor", _("Time"))
factor_but(col, "use_map_life", "life_factor", _("Lifetime"))
factor_but(col, "use_map_density", "density_factor", _("Density"))
factor_but(col, "use_map_size", "size_factor", _("Size"))
col.label(text="General:")
factor_but(col, "use_map_time", "time_factor", "Time")
factor_but(col, "use_map_life", "life_factor", "Lifetime")
factor_but(col, "use_map_density", "density_factor", "Density")
factor_but(col, "use_map_size", "size_factor", "Size")
col = split.column()
col.label(text=_("Physics:"))
factor_but(col, "use_map_velocity", "velocity_factor", _("Velocity"))
factor_but(col, "use_map_damp", "damp_factor", _("Damp"))
factor_but(col, "use_map_gravity", "gravity_factor", _("Gravity"))
factor_but(col, "use_map_field", "field_factor", _("Force Fields"))
col.label(text="Physics:")
factor_but(col, "use_map_velocity", "velocity_factor", "Velocity")
factor_but(col, "use_map_damp", "damp_factor", "Damp")
factor_but(col, "use_map_gravity", "gravity_factor", "Gravity")
factor_but(col, "use_map_field", "field_factor", "Force Fields")
layout.label(text=_("Hair:"))
layout.label(text="Hair:")
split = layout.split()
col = split.column()
factor_but(col, "use_map_length", "length_factor", _("Length"))
factor_but(col, "use_map_clump", "clump_factor", _("Clump"))
factor_but(col, "use_map_length", "length_factor", "Length")
factor_but(col, "use_map_clump", "clump_factor", "Clump")
col = split.column()
factor_but(col, "use_map_kink", "kink_factor", _("Kink"))
factor_but(col, "use_map_rough", "rough_factor", _("Rough"))
factor_but(col, "use_map_kink", "kink_factor", "Kink")
factor_but(col, "use_map_rough", "rough_factor", "Rough")
layout.separator()
@@ -1013,32 +1012,32 @@ class TEXTURE_PT_influence(TextureSlotPanel, Panel):
split = layout.split()
col = split.column()
col.prop(tex, "blend_type", text=_("Blend"))
col.prop(tex, "blend_type", text="Blend")
col.prop(tex, "use_rgb_to_intensity")
# color is used on grayscale textures even when use_rgb_to_intensity is disabled.
col.prop(tex, "color", text="")
col = split.column()
col.prop(tex, "invert", text=_("Negative"))
col.prop(tex, "invert", text="Negative")
col.prop(tex, "use_stencil")
if isinstance(idblock, bpy.types.Material) or isinstance(idblock, bpy.types.World):
col.prop(tex, "default_value", text=_("DVar"), slider=True)
col.prop(tex, "default_value", text="DVar", slider=True)
if isinstance(idblock, bpy.types.Material):
layout.label(text=_("Bump Mapping:"))
layout.label(text="Bump Mapping:")
# only show bump settings if activated but not for normalmap images
row = layout.row()
sub = row.row()
sub.active = (tex.use_map_normal or tex.use_map_warp) and not (tex.texture.type == 'IMAGE' and (tex.texture.use_normal_map or tex.texture.use_derivative_map))
sub.prop(tex, "bump_method", text=_("Method"))
sub.prop(tex, "bump_method", text="Method")
# the space setting is supported for: derivmaps + bumpmaps (DEFAULT,BEST_QUALITY), not for normalmaps
sub = row.row()
sub.active = (tex.use_map_normal or tex.use_map_warp) and not (tex.texture.type == 'IMAGE' and tex.texture.use_normal_map) and ((tex.bump_method in {'BUMP_DEFAULT', 'BUMP_BEST_QUALITY'}) or (tex.texture.type == 'IMAGE' and tex.texture.use_derivative_map))
sub.prop(tex, "bump_objectspace", text=_("Space"))
sub.prop(tex, "bump_objectspace", text="Space")
class TEXTURE_PT_custom_props(TextureButtonsPanel, PropertyPanel, Panel):