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:
authorJeroen Bakker <j.bakker@atmind.nl>2018-06-19 15:00:34 +0300
committerJeroen Bakker <j.bakker@atmind.nl>2018-06-19 15:04:51 +0300
commitde748bbedfb81238d15da2db13b94f276038b9f0 (patch)
tree97e9242a2b83161c49091b243911ebed2527750b /release
parentc564d847efa6b933066c4fc02558d627bca401a4 (diff)
Studiolight: Background Generation of icons
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/space_userpref.py2
-rw-r--r--release/scripts/startup/bl_ui/space_view3d.py6
2 files changed, 5 insertions, 3 deletions
diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index c929a3c0f7d..e7f667f5d5f 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -1617,6 +1617,8 @@ class StudioLightPanelMixin():
op = row.operator('wm.studiolight_uninstall', text="", icon='ZOOMOUT')
op.index = studio_light.index
+ box.label(text=studio_light.name)
+
class USERPREF_PT_studiolight_matcaps(Panel, StudioLightPanelMixin):
bl_label = "MatCaps"
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 1a3b0131eb5..b477aefd9da 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -3630,7 +3630,7 @@ class VIEW3D_PT_shading_lighting(Panel):
layout.row().prop(shading, "light", expand=True)
if shading.light == 'STUDIO':
row = layout.row()
- row.template_icon_view(shading, "studio_light")
+ row.template_icon_view(shading, "studio_light", show_labels=True)
sub = row.column()
sub.operator('wm.studiolight_userpref_show', emboss=False, text="", icon='PREFERENCES')
if shading.selected_studio_light.orientation == 'WORLD':
@@ -3638,14 +3638,14 @@ class VIEW3D_PT_shading_lighting(Panel):
elif shading.light == 'MATCAP':
row = layout.row()
- row.template_icon_view(shading, "studio_light")
+ row.template_icon_view(shading, "studio_light", show_labels=True)
sub = row.column()
sub.operator('VIEW3D_OT_toggle_matcap_flip', emboss=False, text="", icon='ARROW_LEFTRIGHT')
sub.operator('wm.studiolight_userpref_show', emboss=False, text="", icon='PREFERENCES')
elif shading.type in ('MATERIAL'):
row = layout.row()
- row.template_icon_view(shading, "studio_light")
+ row.template_icon_view(shading, "studio_light", show_labels=True)
sub = row.column()
sub.operator('wm.studiolight_userpref_show', emboss=False, text="", icon='PREFERENCES')
if shading.selected_studio_light.orientation == 'WORLD':