diff options
author | Jeroen Bakker <j.bakker@atmind.nl> | 2018-06-21 15:56:00 +0300 |
---|---|---|
committer | Jeroen Bakker <j.bakker@atmind.nl> | 2018-06-21 15:58:00 +0300 |
commit | d5552a6d4ba5bb4ac34fe149c2ac9d7ff3f723fe (patch) | |
tree | b1eb026add3eba7fc74fdb225e2ff25e098fb957 /release | |
parent | 3584810fdd1e35831d5445cf9da24e58ed2fd6d7 (diff) |
T55570: Moved Texture drawtype as to shading popover
the use of the texture drawtype is limited. so who should we have it
this prominent on the screen. By adding it as a shading.color_type
option we should save some screenspace.
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 63 |
1 files changed, 31 insertions, 32 deletions
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 0dbbf3ab927..804da7ede78 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -3646,7 +3646,7 @@ class VIEW3D_PT_shading_lighting(Panel): view = context.space_data shading = view.shading - if shading.type in ('SOLID', 'TEXTURED'): + if shading.type == 'SOLID': layout.row().prop(shading, "light", expand=True) if shading.light == 'STUDIO': row = layout.row() @@ -3663,7 +3663,7 @@ class VIEW3D_PT_shading_lighting(Panel): 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'): + elif shading.type == 'MATERIAL': row = layout.row() row.template_icon_view(shading, "studio_light", show_labels=True) sub = row.column() @@ -3708,7 +3708,7 @@ class VIEW3D_PT_shading_options(Panel): def poll(cls, context): view = context.space_data shading = view.shading - return shading.type in ['SOLID', 'TEXTURED'] + return shading.type == 'SOLID' def draw(self, context): layout = self.layout @@ -3720,35 +3720,34 @@ class VIEW3D_PT_shading_options(Panel): row = layout.row() row.prop(shading, "show_specular_highlight") - if shading.type in ('SOLID', 'TEXTURED'): - row = layout.split(0.4) - row.prop(shading, "show_xray") - sub = row.row() - sub.active = shading.show_xray - sub.prop(shading, "xray_alpha", text="") - - row = layout.split(0.4) - row.active = not shading.show_xray - row.prop(shading, "show_shadows") - sub = row.row() - sub.active = shading.show_shadows and not shading.show_xray - sub.prop(shading, "shadow_intensity", text="") - - row = layout.split(0.4) - row.active = not shading.show_xray - row.prop(shading, "show_cavity") - sub = row.column(align=True) - sub.active = not shading.show_xray and shading.show_cavity - sub.prop(shading, "cavity_ridge_factor") - sub.prop(shading, "cavity_valley_factor") - - row = layout.split(0.4) - row.prop(shading, "show_object_outline") - sub = row.row() - sub.active = shading.show_object_outline - sub.prop(shading, "object_outline_color", text="") - - layout.prop(view, "show_world") + row = layout.split(0.4) + row.prop(shading, "show_xray") + sub = row.row() + sub.active = shading.show_xray + sub.prop(shading, "xray_alpha", text="") + + row = layout.split(0.4) + row.active = not shading.show_xray + row.prop(shading, "show_shadows") + sub = row.row() + sub.active = shading.show_shadows and not shading.show_xray + sub.prop(shading, "shadow_intensity", text="") + + row = layout.split(0.4) + row.active = not shading.show_xray + row.prop(shading, "show_cavity") + sub = row.column(align=True) + sub.active = not shading.show_xray and shading.show_cavity + sub.prop(shading, "cavity_ridge_factor") + sub.prop(shading, "cavity_valley_factor") + + row = layout.split(0.4) + row.prop(shading, "show_object_outline") + sub = row.row() + sub.active = shading.show_object_outline + sub.prop(shading, "object_outline_color", text="") + + layout.prop(view, "show_world") class VIEW3D_PT_overlay(Panel): |