diff options
Diffstat (limited to 'release/scripts/startup/bl_ui/properties_texture.py')
-rw-r--r-- | release/scripts/startup/bl_ui/properties_texture.py | 39 |
1 files changed, 36 insertions, 3 deletions
diff --git a/release/scripts/startup/bl_ui/properties_texture.py b/release/scripts/startup/bl_ui/properties_texture.py index 6842b324b0e..9e8fd0470cf 100644 --- a/release/scripts/startup/bl_ui/properties_texture.py +++ b/release/scripts/startup/bl_ui/properties_texture.py @@ -30,7 +30,7 @@ from bpy.types import (Brush, from rna_prop_ui import PropertyPanel -from bl_ui.properties_paint_common import sculpt_brush_texture_settings +from bl_ui.properties_paint_common import brush_texture_settings class TEXTURE_MT_specials(Menu): @@ -432,6 +432,12 @@ class TEXTURE_PT_image_sampling(TextureTypePanel, Panel): COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} def draw(self, context): + if context.scene.render.engine == 'BLENDER_GAME': + self.draw_bge(context) + else: + self.draw_bi(context) + + def draw_bi(self, context): layout = self.layout idblock = context_tex_datablock(context) @@ -468,6 +474,33 @@ class TEXTURE_PT_image_sampling(TextureTypePanel, Panel): texture_filter_common(tex, col) + def draw_bge(self, context): + layout = self.layout + + idblock = context_tex_datablock(context) + tex = context.texture + slot = getattr(context, "texture_slot", None) + + split = layout.split() + + col = split.column() + col.label(text="Alpha:") + col.prop(tex, "use_calculate_alpha", text="Calculate") + col.prop(tex, "invert_alpha", text="Invert") + + col = split.column() + + #Only for Material based textures, not for Lamp/World... + if slot and isinstance(idblock, Material): + col.prop(tex, "use_normal_map") + row = col.row() + row.active = tex.use_normal_map + row.prop(slot, "normal_map_space", text="") + + row = col.row() + row.active = not tex.use_normal_map + row.prop(tex, "use_derivative_map") + class TEXTURE_PT_image_mapping(TextureTypePanel, Panel): bl_label = "Image Mapping" @@ -884,8 +917,8 @@ class TEXTURE_PT_mapping(TextureSlotPanel, Panel): split.prop(tex, "object", text="") if isinstance(idblock, Brush): - if context.sculpt_object: - sculpt_brush_texture_settings(layout, idblock) + if context.sculpt_object or context.image_paint_object: + brush_texture_settings(layout, idblock, context.sculpt_object) else: if isinstance(idblock, Material): split = layout.split(percentage=0.3) |