diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-07-13 21:52:23 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-07-13 21:52:23 +0400 |
commit | 74536efa9180da90daf651b162296a474e5bfde8 (patch) | |
tree | 59ef9a58549a9ac6bb99d4c0d6b81e04fab894a3 /release | |
parent | 5e841e4b4a30bbb242290407740b5ca3afbab972 (diff) |
Fix #26704: activating a texture node inside material nodes did not show that
texture in the texture properties.
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/startup/bl_ui/properties_texture.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/release/scripts/startup/bl_ui/properties_texture.py b/release/scripts/startup/bl_ui/properties_texture.py index f0265f8db67..292e43a01a6 100644 --- a/release/scripts/startup/bl_ui/properties_texture.py +++ b/release/scripts/startup/bl_ui/properties_texture.py @@ -88,15 +88,15 @@ class TEXTURE_PT_context_texture(TextureButtonsPanel, bpy.types.Panel): @classmethod def poll(cls, context): engine = context.scene.render.engine - if not hasattr(context, "texture_slot"): + 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, bpy.types.ParticleSettings)) and (engine in cls.COMPAT_ENGINES)) def draw(self, context): layout = self.layout - slot = context.texture_slot - node = context.texture_node + slot = getattr(context, "texture_slot", None) + node = getattr(context, "texture_node", None) space = context.space_data tex = context.texture idblock = context_tex_datablock(context) |