diff options
author | M.G. Kishalmi <lmg@kishalmi.net> | 2011-01-29 14:56:11 +0300 |
---|---|---|
committer | M.G. Kishalmi <lmg@kishalmi.net> | 2011-01-29 14:56:11 +0300 |
commit | c709524dc9a2489c9f0af7107ad5246952d2250f (patch) | |
tree | 65cb718e1d05f7fe017272befe8ba5fdb8c9e646 /release | |
parent | e7e5fa06301430d8c37b302ca70c45a216bc16cf (diff) |
new bumpmapping options for the renderer
oldbump -> original
newbump -> compatible
*new* -> default (3tap)
*new* -> best quality (5tap)
the latter two have an option to apply bumpmapping in
viewspace - much like displacement mapping
objectspace - default (scales with the object)
texturespace - much like normal mapping (scales)
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/ui/properties_texture.py | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/release/scripts/ui/properties_texture.py b/release/scripts/ui/properties_texture.py index 701fa1eb336..bd9f1a3b13f 100644 --- a/release/scripts/ui/properties_texture.py +++ b/release/scripts/ui/properties_texture.py @@ -994,11 +994,6 @@ class TEXTURE_PT_influence(TextureSlotPanel, bpy.types.Panel): # color is used on grayscale textures even when use_rgb_to_intensity is disabled. col.prop(tex, "color", text="") - if isinstance(idblock, bpy.types.Material): - sub = layout.row() - sub.prop(tex, "bump_method", text="Bump Method") - sub.active = tex.use_map_normal - col = split.column() col.prop(tex, "invert", text="Negative") col.prop(tex, "use_stencil") @@ -1006,6 +1001,21 @@ class TEXTURE_PT_influence(TextureSlotPanel, bpy.types.Panel): if isinstance(idblock, bpy.types.Material) or isinstance(idblock, bpy.types.World): col.prop(tex, "default_value", text="DVar", slider=True) + if isinstance(idblock, bpy.types.Material): + row = layout.row() + row.label(text="Bump Mapping:") + + row = layout.row() + # only show bump settings if activated but not for normalmap images + row.active = tex.use_map_normal and not( tex.texture.type == 'IMAGE' and tex.texture.use_normal_map ) + + col = row.column() + col.prop(tex, "bump_method", text="Method") + + col = row.column() + col.prop(tex, "bump_objectspace", text="Space") + col.active = tex.bump_method in ('BUMP_DEFAULT', 'BUMP_BEST_QUALITY') + class TEXTURE_PT_custom_props(TextureButtonsPanel, PropertyPanel, bpy.types.Panel): COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} |