Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-06-05 17:35:20 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-06-05 17:36:13 +0300
commit7436fb2ef1d8bb0af0589f8ec4b45c8800aed983 (patch)
treee99050b05bf97b20cc0f5c05ea549aa31d8fba09 /release/scripts/startup/bl_ui/properties_texture.py
parentd94df18550702a9df7b56feb5d58fb20effb7536 (diff)
parentc68429bc038635a6c2a3f29a5b057c077be3a4b0 (diff)
Merge branch 'master' into 28
Diffstat (limited to 'release/scripts/startup/bl_ui/properties_texture.py')
-rw-r--r--release/scripts/startup/bl_ui/properties_texture.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/release/scripts/startup/bl_ui/properties_texture.py b/release/scripts/startup/bl_ui/properties_texture.py
index aa3227e0b72..e5bf2c910a0 100644
--- a/release/scripts/startup/bl_ui/properties_texture.py
+++ b/release/scripts/startup/bl_ui/properties_texture.py
@@ -59,6 +59,7 @@ class TEXTURE_UL_texslots(UIList):
layout.alignment = 'CENTER'
layout.label(text="", icon_value=icon)
+
def context_tex_datablock(context):
idblock = context.brush
if idblock:
@@ -106,6 +107,7 @@ class TEXTURE_PT_preview(TextureButtonsPanel, Panel):
if isinstance(idblock, Brush):
layout.prop(tex, "use_preview_alpha")
+
class TEXTURE_PT_context(TextureButtonsPanel, Panel):
bl_label = ""
bl_context = "texture"