diff options
author | Jeroen Bakker <j.bakker@atmind.nl> | 2018-06-05 09:15:30 +0300 |
---|---|---|
committer | Jeroen Bakker <j.bakker@atmind.nl> | 2018-06-05 12:38:33 +0300 |
commit | a3815f87773c7d45740c98c888718424d736870b (patch) | |
tree | 4cd46cb327fe76e1dfcde04dcdd99d1cc4a2e9b5 /release/scripts | |
parent | ade710500df4f333077daa96e3ab72eb2cdc3b94 (diff) |
Workbench: Matcaps T55291
- users can use their own matcaps
.config/blender/2.80/datafiles/studiolights/matcap/ folder
- upto 100 matcaps can be loaded
- color of the matcap is influenced by the color of the material/single
color etc. To show the plain matcap use single color at 1.0
- chosing a matcap is at lighting level (flat/studio/matcap)
- matcap only possible in solid mode
- also works for X-Ray mode
As the old matcaps are still in used by the clay engine I didn't remove
it yet.
Diffstat (limited to 'release/scripts')
-rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index ea3a804e7c3..68719170a70 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -3518,12 +3518,6 @@ class VIEW3D_PT_shading(Panel): col = layout.column() - if shading.type == 'SOLID': - col.row().prop(shading, "color_type", expand=True) - - if shading.color_type == 'SINGLE': - col.row().prop(shading, "single_color", text="") - if shading.type in ('SOLID', 'TEXTURED'): col.row().prop(shading, "light", expand=True) if shading.light == 'STUDIO': @@ -3531,11 +3525,20 @@ class VIEW3D_PT_shading(Panel): if shading.studio_light_orientation == 'WORLD': col.row().prop(shading, "studiolight_rot_z") + elif shading.light == 'MATCAP': + col.row().template_icon_view(shading, "matcap") + + if shading.type == 'SOLID': + col.row().prop(shading, "color_type", expand=True) + + if shading.color_type == 'SINGLE': + col.row().prop(shading, "single_color", text="") + + if not(shading.type == 'SOLID' and shading.light == 'MATCAP'): row = col.row() row.prop(shading, "show_specular_highlight") - col.separator() - + if shading.type in ('SOLID', 'TEXTURED'): row = col.row() row.prop(shading, "show_xray") sub = row.row() |