diff options
Diffstat (limited to 'release/scripts/startup/bl_ui/properties_texture.py')
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_texture.py | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/release/scripts/startup/bl_ui/properties_texture.py b/release/scripts/startup/bl_ui/properties_texture.py index 46a17675c91..e623d034b48 100644 --- a/release/scripts/startup/bl_ui/properties_texture.py +++ b/release/scripts/startup/bl_ui/properties_texture.py @@ -111,8 +111,14 @@ class TEXTURE_PT_context_texture(TextureButtonsPanel, Panel): engine = context.scene.render.engine if not (hasattr(context, "texture_slot") or hasattr(context, "texture_node")): return False - return ((context.material or context.world or context.lamp or context.brush or context.texture or context.particle_system or isinstance(context.space_data.pin_id, ParticleSettings)) - and (engine in cls.COMPAT_ENGINES)) + return ((context.material or + context.world or + context.lamp or + context.brush or + context.texture or + context.particle_system or + isinstance(context.space_data.pin_id, ParticleSettings)) and + (engine in cls.COMPAT_ENGINES)) def draw(self, context): layout = self.layout @@ -143,20 +149,15 @@ class TEXTURE_PT_context_texture(TextureButtonsPanel, Panel): col.operator("texture.slot_move", text="", icon='TRIA_DOWN').type = 'DOWN' col.menu("TEXTURE_MT_specials", icon='DOWNARROW_HLT', text="") - split = layout.split(percentage=0.65) - col = split.column() - if tex_collection: - col.template_ID(idblock, "active_texture", new="texture.new") + layout.template_ID(idblock, "active_texture", new="texture.new") elif node: - col.template_ID(node, "texture", new="texture.new") + layout.template_ID(node, "texture", new="texture.new") elif idblock: - col.template_ID(idblock, "texture", new="texture.new") + layout.template_ID(idblock, "texture", new="texture.new") if pin_id: - col.template_ID(space, "pin_id") - - col = split.column() + layout.template_ID(space, "pin_id") if tex: split = layout.split(percentage=0.2) @@ -881,8 +882,12 @@ class TEXTURE_PT_mapping(TextureSlotPanel, Panel): col = split.column() if tex.texture_coords in {'ORCO', 'UV'}: col.prop(tex, "use_from_dupli") + if (idblock.type == 'VOLUME' and tex.texture_coords == 'ORCO'): + col.prop(tex, "use_map_to_bounds") elif tex.texture_coords == 'OBJECT': col.prop(tex, "use_from_original") + if (idblock.type == 'VOLUME'): + col.prop(tex, "use_map_to_bounds") else: col.label() |