diff options
Diffstat (limited to 'release')
26 files changed, 14 insertions, 8 deletions
diff --git a/release/datafiles/studiolights/matcap/license.txt b/release/datafiles/studiolights/matcap/license.txt new file mode 100644 index 00000000000..358c8dcd832 --- /dev/null +++ b/release/datafiles/studiolights/matcap/license.txt @@ -0,0 +1,3 @@ +These matcap images are licensed as GNU GPL 2 or later, like the rest of Blender's code. + +Thanks to Kent Trammell, Aidy Burrows, John Herreno , Terry Wallwork and David Silverman for making the pictures. diff --git a/release/datafiles/studiolights/matcap/mc01.jpg b/release/datafiles/studiolights/matcap/mc01.jpg Binary files differnew file mode 100644 index 00000000000..8c7aef287ee --- /dev/null +++ b/release/datafiles/studiolights/matcap/mc01.jpg diff --git a/release/datafiles/studiolights/matcap/mc02.jpg b/release/datafiles/studiolights/matcap/mc02.jpg Binary files differnew file mode 100644 index 00000000000..11deddfeaed --- /dev/null +++ b/release/datafiles/studiolights/matcap/mc02.jpg diff --git a/release/datafiles/studiolights/matcap/mc03.jpg b/release/datafiles/studiolights/matcap/mc03.jpg Binary files differnew file mode 100644 index 00000000000..64d992fb61a --- /dev/null +++ b/release/datafiles/studiolights/matcap/mc03.jpg diff --git a/release/datafiles/studiolights/matcap/mc04.jpg b/release/datafiles/studiolights/matcap/mc04.jpg Binary files differnew file mode 100644 index 00000000000..42be580ee93 --- /dev/null +++ b/release/datafiles/studiolights/matcap/mc04.jpg diff --git a/release/datafiles/studiolights/matcap/mc05.jpg b/release/datafiles/studiolights/matcap/mc05.jpg Binary files differnew file mode 100644 index 00000000000..586d233ef31 --- /dev/null +++ b/release/datafiles/studiolights/matcap/mc05.jpg diff --git a/release/datafiles/studiolights/matcap/mc06.jpg b/release/datafiles/studiolights/matcap/mc06.jpg Binary files differnew file mode 100644 index 00000000000..657883d0866 --- /dev/null +++ b/release/datafiles/studiolights/matcap/mc06.jpg diff --git a/release/datafiles/studiolights/matcap/mc07.jpg b/release/datafiles/studiolights/matcap/mc07.jpg Binary files differnew file mode 100644 index 00000000000..372caf7e87c --- /dev/null +++ b/release/datafiles/studiolights/matcap/mc07.jpg diff --git a/release/datafiles/studiolights/matcap/mc08.jpg b/release/datafiles/studiolights/matcap/mc08.jpg Binary files differnew file mode 100644 index 00000000000..50eec402812 --- /dev/null +++ b/release/datafiles/studiolights/matcap/mc08.jpg diff --git a/release/datafiles/studiolights/matcap/mc09.jpg b/release/datafiles/studiolights/matcap/mc09.jpg Binary files differnew file mode 100644 index 00000000000..e05d441aaf9 --- /dev/null +++ b/release/datafiles/studiolights/matcap/mc09.jpg diff --git a/release/datafiles/studiolights/matcap/mc10.jpg b/release/datafiles/studiolights/matcap/mc10.jpg Binary files differnew file mode 100644 index 00000000000..ab82f17bb93 --- /dev/null +++ b/release/datafiles/studiolights/matcap/mc10.jpg diff --git a/release/datafiles/studiolights/matcap/mc11.jpg b/release/datafiles/studiolights/matcap/mc11.jpg Binary files differnew file mode 100644 index 00000000000..053550f082c --- /dev/null +++ b/release/datafiles/studiolights/matcap/mc11.jpg diff --git a/release/datafiles/studiolights/matcap/mc12.jpg b/release/datafiles/studiolights/matcap/mc12.jpg Binary files differnew file mode 100644 index 00000000000..beb16f3742e --- /dev/null +++ b/release/datafiles/studiolights/matcap/mc12.jpg diff --git a/release/datafiles/studiolights/matcap/mc13.jpg b/release/datafiles/studiolights/matcap/mc13.jpg Binary files differnew file mode 100644 index 00000000000..7fb8fa58e8f --- /dev/null +++ b/release/datafiles/studiolights/matcap/mc13.jpg diff --git a/release/datafiles/studiolights/matcap/mc14.jpg b/release/datafiles/studiolights/matcap/mc14.jpg Binary files differnew file mode 100644 index 00000000000..ba868d2f95a --- /dev/null +++ b/release/datafiles/studiolights/matcap/mc14.jpg diff --git a/release/datafiles/studiolights/matcap/mc15.jpg b/release/datafiles/studiolights/matcap/mc15.jpg Binary files differnew file mode 100644 index 00000000000..b10ea326a42 --- /dev/null +++ b/release/datafiles/studiolights/matcap/mc15.jpg diff --git a/release/datafiles/studiolights/matcap/mc16.jpg b/release/datafiles/studiolights/matcap/mc16.jpg Binary files differnew file mode 100644 index 00000000000..c6ce02d59df --- /dev/null +++ b/release/datafiles/studiolights/matcap/mc16.jpg diff --git a/release/datafiles/studiolights/matcap/mc17.jpg b/release/datafiles/studiolights/matcap/mc17.jpg Binary files differnew file mode 100644 index 00000000000..14f15f70460 --- /dev/null +++ b/release/datafiles/studiolights/matcap/mc17.jpg diff --git a/release/datafiles/studiolights/matcap/mc18.jpg b/release/datafiles/studiolights/matcap/mc18.jpg Binary files differnew file mode 100644 index 00000000000..db572856b07 --- /dev/null +++ b/release/datafiles/studiolights/matcap/mc18.jpg diff --git a/release/datafiles/studiolights/matcap/mc19.jpg b/release/datafiles/studiolights/matcap/mc19.jpg Binary files differnew file mode 100644 index 00000000000..56d2efb1734 --- /dev/null +++ b/release/datafiles/studiolights/matcap/mc19.jpg diff --git a/release/datafiles/studiolights/matcap/mc20.jpg b/release/datafiles/studiolights/matcap/mc20.jpg Binary files differnew file mode 100644 index 00000000000..002a0910dd9 --- /dev/null +++ b/release/datafiles/studiolights/matcap/mc20.jpg diff --git a/release/datafiles/studiolights/matcap/mc21.jpg b/release/datafiles/studiolights/matcap/mc21.jpg Binary files differnew file mode 100644 index 00000000000..cb2fea573b8 --- /dev/null +++ b/release/datafiles/studiolights/matcap/mc21.jpg diff --git a/release/datafiles/studiolights/matcap/mc22.jpg b/release/datafiles/studiolights/matcap/mc22.jpg Binary files differnew file mode 100644 index 00000000000..2fc71b98c5a --- /dev/null +++ b/release/datafiles/studiolights/matcap/mc22.jpg diff --git a/release/datafiles/studiolights/matcap/mc23.jpg b/release/datafiles/studiolights/matcap/mc23.jpg Binary files differnew file mode 100644 index 00000000000..3793c0fcaa5 --- /dev/null +++ b/release/datafiles/studiolights/matcap/mc23.jpg diff --git a/release/datafiles/studiolights/matcap/mc24.jpg b/release/datafiles/studiolights/matcap/mc24.jpg Binary files differnew file mode 100644 index 00000000000..2a9618d8fe1 --- /dev/null +++ b/release/datafiles/studiolights/matcap/mc24.jpg 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() |