[Bf-blender-cvs] [6a493e44302] blender2.8: Viewport: add new default set of matcaps.

Brecht Van Lommel noreply at git.blender.org
Mon Jul 30 14:03:28 CEST 2018


Commit: 6a493e44302588c35a269ed34a3e679c7912074b
Author: Brecht Van Lommel
Date:   Mon Jul 30 13:43:06 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB6a493e44302588c35a269ed34a3e679c7912074b

Viewport: add new default set of matcaps.

These were made by the community and curated by Pablo and William.
Thanks to everyone who contributed!
https://devtalk.blender.org/t/call-for-content-matcaps/737

Command used for compression:
oiiotool %s --ch R,G,B -d half --compression dwab -o output/%s

===================================================================

A	release/datafiles/studiolights/matcap/basic_1.exr
A	release/datafiles/studiolights/matcap/basic_2.exr
A	release/datafiles/studiolights/matcap/basic_dark.exr
A	release/datafiles/studiolights/matcap/basic_side.exr
A	release/datafiles/studiolights/matcap/ceramic_dark.exr
A	release/datafiles/studiolights/matcap/ceramic_lightbulb.exr
A	release/datafiles/studiolights/matcap/check_normal+y.exr
A	release/datafiles/studiolights/matcap/check_reflection.exr
A	release/datafiles/studiolights/matcap/check_rim_dark.exr
A	release/datafiles/studiolights/matcap/check_rim_light.exr
A	release/datafiles/studiolights/matcap/clay_brown.exr
A	release/datafiles/studiolights/matcap/clay_muddy.exr
A	release/datafiles/studiolights/matcap/clay_studio.exr
A	release/datafiles/studiolights/matcap/jade.exr
M	release/datafiles/studiolights/matcap/license.txt
D	release/datafiles/studiolights/matcap/mc01.jpg
D	release/datafiles/studiolights/matcap/mc02.jpg
D	release/datafiles/studiolights/matcap/mc03.jpg
D	release/datafiles/studiolights/matcap/mc04.jpg
D	release/datafiles/studiolights/matcap/mc05.jpg
D	release/datafiles/studiolights/matcap/mc06.jpg
D	release/datafiles/studiolights/matcap/mc07.jpg
D	release/datafiles/studiolights/matcap/mc08.jpg
D	release/datafiles/studiolights/matcap/mc09.jpg
D	release/datafiles/studiolights/matcap/mc10.jpg
D	release/datafiles/studiolights/matcap/mc11.jpg
D	release/datafiles/studiolights/matcap/mc12.jpg
D	release/datafiles/studiolights/matcap/mc13.jpg
D	release/datafiles/studiolights/matcap/mc14.jpg
D	release/datafiles/studiolights/matcap/mc15.jpg
D	release/datafiles/studiolights/matcap/mc16.jpg
D	release/datafiles/studiolights/matcap/mc17.jpg
D	release/datafiles/studiolights/matcap/mc18.jpg
D	release/datafiles/studiolights/matcap/mc19.jpg
D	release/datafiles/studiolights/matcap/mc20.jpg
D	release/datafiles/studiolights/matcap/mc21.jpg
D	release/datafiles/studiolights/matcap/mc22.jpg
D	release/datafiles/studiolights/matcap/mc23.jpg
D	release/datafiles/studiolights/matcap/mc24.jpg
A	release/datafiles/studiolights/matcap/metal_anisotropic.exr
A	release/datafiles/studiolights/matcap/metal_carpaint.exr
A	release/datafiles/studiolights/matcap/metal_lead.exr
A	release/datafiles/studiolights/matcap/metal_shiny.exr
A	release/datafiles/studiolights/matcap/pearl.exr
A	release/datafiles/studiolights/matcap/resin.exr
A	release/datafiles/studiolights/matcap/skin.exr
A	release/datafiles/studiolights/matcap/toon.exr

===================================================================

diff --git a/release/datafiles/studiolights/matcap/basic_1.exr b/release/datafiles/studiolights/matcap/basic_1.exr
new file mode 100644
index 00000000000..bb2e09abbd2
Binary files /dev/null and b/release/datafiles/studiolights/matcap/basic_1.exr differ
diff --git a/release/datafiles/studiolights/matcap/basic_2.exr b/release/datafiles/studiolights/matcap/basic_2.exr
new file mode 100644
index 00000000000..d97f7630d63
Binary files /dev/null and b/release/datafiles/studiolights/matcap/basic_2.exr differ
diff --git a/release/datafiles/studiolights/matcap/basic_dark.exr b/release/datafiles/studiolights/matcap/basic_dark.exr
new file mode 100644
index 00000000000..b623c8030f8
Binary files /dev/null and b/release/datafiles/studiolights/matcap/basic_dark.exr differ
diff --git a/release/datafiles/studiolights/matcap/basic_side.exr b/release/datafiles/studiolights/matcap/basic_side.exr
new file mode 100644
index 00000000000..6e4452e7511
Binary files /dev/null and b/release/datafiles/studiolights/matcap/basic_side.exr differ
diff --git a/release/datafiles/studiolights/matcap/ceramic_dark.exr b/release/datafiles/studiolights/matcap/ceramic_dark.exr
new file mode 100644
index 00000000000..837b020c96d
Binary files /dev/null and b/release/datafiles/studiolights/matcap/ceramic_dark.exr differ
diff --git a/release/datafiles/studiolights/matcap/ceramic_lightbulb.exr b/release/datafiles/studiolights/matcap/ceramic_lightbulb.exr
new file mode 100644
index 00000000000..e05b6612e46
Binary files /dev/null and b/release/datafiles/studiolights/matcap/ceramic_lightbulb.exr differ
diff --git a/release/datafiles/studiolights/matcap/check_normal+y.exr b/release/datafiles/studiolights/matcap/check_normal+y.exr
new file mode 100644
index 00000000000..4e2a97ac3b9
Binary files /dev/null and b/release/datafiles/studiolights/matcap/check_normal+y.exr differ
diff --git a/release/datafiles/studiolights/matcap/check_reflection.exr b/release/datafiles/studiolights/matcap/check_reflection.exr
new file mode 100644
index 00000000000..245d6059241
Binary files /dev/null and b/release/datafiles/studiolights/matcap/check_reflection.exr differ
diff --git a/release/datafiles/studiolights/matcap/check_rim_dark.exr b/release/datafiles/studiolights/matcap/check_rim_dark.exr
new file mode 100644
index 00000000000..e6a32004ea1
Binary files /dev/null and b/release/datafiles/studiolights/matcap/check_rim_dark.exr differ
diff --git a/release/datafiles/studiolights/matcap/check_rim_light.exr b/release/datafiles/studiolights/matcap/check_rim_light.exr
new file mode 100644
index 00000000000..6318c0f9346
Binary files /dev/null and b/release/datafiles/studiolights/matcap/check_rim_light.exr differ
diff --git a/release/datafiles/studiolights/matcap/clay_brown.exr b/release/datafiles/studiolights/matcap/clay_brown.exr
new file mode 100644
index 00000000000..fe1e0305383
Binary files /dev/null and b/release/datafiles/studiolights/matcap/clay_brown.exr differ
diff --git a/release/datafiles/studiolights/matcap/clay_muddy.exr b/release/datafiles/studiolights/matcap/clay_muddy.exr
new file mode 100644
index 00000000000..d219578c62b
Binary files /dev/null and b/release/datafiles/studiolights/matcap/clay_muddy.exr differ
diff --git a/release/datafiles/studiolights/matcap/clay_studio.exr b/release/datafiles/studiolights/matcap/clay_studio.exr
new file mode 100644
index 00000000000..7746e6d0e35
Binary files /dev/null and b/release/datafiles/studiolights/matcap/clay_studio.exr differ
diff --git a/release/datafiles/studiolights/matcap/jade.exr b/release/datafiles/studiolights/matcap/jade.exr
new file mode 100644
index 00000000000..fe1211f1b65
Binary files /dev/null and b/release/datafiles/studiolights/matcap/jade.exr differ
diff --git a/release/datafiles/studiolights/matcap/license.txt b/release/datafiles/studiolights/matcap/license.txt
index 358c8dcd832..09a0f7a439e 100644
--- a/release/datafiles/studiolights/matcap/license.txt
+++ b/release/datafiles/studiolights/matcap/license.txt
@@ -1,3 +1,3 @@
-These matcap images are licensed as GNU GPL 2 or later, like the rest of Blender's code.
+These matcap images are licensed as CC0 or public domain.
 
-Thanks to Kent Trammell, Aidy Burrows, John Herreno , Terry Wallwork and David Silverman for making the pictures.
+Thanks to the Blender community for contributing these matcaps.
diff --git a/release/datafiles/studiolights/matcap/mc01.jpg b/release/datafiles/studiolights/matcap/mc01.jpg
deleted file mode 100644
index 8c7aef287ee..00000000000
Binary files a/release/datafiles/studiolights/matcap/mc01.jpg and /dev/null differ
diff --git a/release/datafiles/studiolights/matcap/mc02.jpg b/release/datafiles/studiolights/matcap/mc02.jpg
deleted file mode 100644
index 11deddfeaed..00000000000
Binary files a/release/datafiles/studiolights/matcap/mc02.jpg and /dev/null differ
diff --git a/release/datafiles/studiolights/matcap/mc03.jpg b/release/datafiles/studiolights/matcap/mc03.jpg
deleted file mode 100644
index 64d992fb61a..00000000000
Binary files a/release/datafiles/studiolights/matcap/mc03.jpg and /dev/null differ
diff --git a/release/datafiles/studiolights/matcap/mc04.jpg b/release/datafiles/studiolights/matcap/mc04.jpg
deleted file mode 100644
index 42be580ee93..00000000000
Binary files a/release/datafiles/studiolights/matcap/mc04.jpg and /dev/null differ
diff --git a/release/datafiles/studiolights/matcap/mc05.jpg b/release/datafiles/studiolights/matcap/mc05.jpg
deleted file mode 100644
index 586d233ef31..00000000000
Binary files a/release/datafiles/studiolights/matcap/mc05.jpg and /dev/null differ
diff --git a/release/datafiles/studiolights/matcap/mc06.jpg b/release/datafiles/studiolights/matcap/mc06.jpg
deleted file mode 100644
index 657883d0866..00000000000
Binary files a/release/datafiles/studiolights/matcap/mc06.jpg and /dev/null differ
diff --git a/release/datafiles/studiolights/matcap/mc07.jpg b/release/datafiles/studiolights/matcap/mc07.jpg
deleted file mode 100644
index 372caf7e87c..00000000000
Binary files a/release/datafiles/studiolights/matcap/mc07.jpg and /dev/null differ
diff --git a/release/datafiles/studiolights/matcap/mc08.jpg b/release/datafiles/studiolights/matcap/mc08.jpg
deleted file mode 100644
index 50eec402812..00000000000
Binary files a/release/datafiles/studiolights/matcap/mc08.jpg and /dev/null differ
diff --git a/release/datafiles/studiolights/matcap/mc09.jpg b/release/datafiles/studiolights/matcap/mc09.jpg
deleted file mode 100644
index e05d441aaf9..00000000000
Binary files a/release/datafiles/studiolights/matcap/mc09.jpg and /dev/null differ
diff --git a/release/datafiles/studiolights/matcap/mc10.jpg b/release/datafiles/studiolights/matcap/mc10.jpg
deleted file mode 100644
index ab82f17bb93..00000000000
Binary files a/release/datafiles/studiolights/matcap/mc10.jpg and /dev/null differ
diff --git a/release/datafiles/studiolights/matcap/mc11.jpg b/release/datafiles/studiolights/matcap/mc11.jpg
deleted file mode 100644
index 053550f082c..00000000000
Binary files a/release/datafiles/studiolights/matcap/mc11.jpg and /dev/null differ
diff --git a/release/datafiles/studiolights/matcap/mc12.jpg b/release/datafiles/studiolights/matcap/mc12.jpg
deleted file mode 100644
index beb16f3742e..00000000000
Binary files a/release/datafiles/studiolights/matcap/mc12.jpg and /dev/null differ
diff --git a/release/datafiles/studiolights/matcap/mc13.jpg b/release/datafiles/studiolights/matcap/mc13.jpg
deleted file mode 100644
index 7fb8fa58e8f..00000000000
Binary files a/release/datafiles/studiolights/matcap/mc13.jpg and /dev/null differ
diff --git a/release/datafiles/studiolights/matcap/mc14.jpg b/release/datafiles/studiolights/matcap/mc14.jpg
deleted file mode 100644
index ba868d2f95a..00000000000
Binary files a/release/datafiles/studiolights/matcap/mc14.jpg and /dev/null differ
diff --git a/release/datafiles/studiolights/matcap/mc15.jpg b/release/datafiles/studiolights/matcap/mc15.jpg
deleted file mode 100644
index b10ea326a42..00000000000
Binary files a/release/datafiles/studiolights/matcap/mc15.jpg and /dev/null differ
diff --git a/release/datafiles/studiolights/matcap/mc16.jpg b/release/datafiles/studiolights/matcap/mc16.jpg
deleted file mode 100644
index c6ce02d59df..00000000000
Binary files a/release/datafiles/studiolights/matcap/mc16.jpg and /dev/null differ
diff --git a/release/datafiles/studiolights/matcap/mc17.jpg b/release/datafiles/studiolights/matcap/mc17.jpg
deleted file mode 100644
index 14f15f70460..00000000000
Binary files a/release/datafiles/studiolights/matcap/mc17.jpg and /dev/null differ
diff --git a/release/datafiles/studiolights/matcap/mc18.jpg b/release/datafiles/studiolights/matcap/mc18.jpg
deleted file mode 100644
index db572856b07..00000000000
Binary files a/release/datafiles/studiolights/matcap/mc18.jpg and /dev/null differ
diff --git a/release/datafiles/studiolights/matcap/mc19.jpg b/release/datafiles/studiolights/matcap/mc19.jpg
deleted file mode 100644
index 56d2efb1734..00000000000
Binary files a/release/datafiles/studiolights/matcap/mc19.jpg and /dev/null differ
diff --git a/release/datafiles/studiolights/matcap/mc20.jpg b/release/datafiles/studiolights/matcap/mc20.jpg
deleted file mode 100644
index 002a0910dd9..00000000000
Binary files a/release/datafiles/studiolights/matcap/mc20.jpg and /dev/null differ
diff --git a/release/datafiles/studiolights/matcap/mc21.jpg b/release/datafiles/studiolights/matcap/mc21.jpg
deleted file mode 100644
index cb2fea573b8..00000000000
Binary files a/release/datafiles/studiolights/matcap/mc21.jpg and /dev/null differ
diff --git a/release/datafiles/studiolights/matcap/mc22.jpg b/release/datafiles/studiolights/matcap/mc22.jpg
deleted file mode 100644
index 2fc71b98c5a..00000000000
Binary files a/release/datafiles/studiolights/matcap/mc22.jpg and /dev/null differ
diff --git a/release/datafiles/studiolights/matcap/mc23.jpg b/release/datafiles/studiolights/matcap/mc23.jpg
deleted file mode 100644
index 3793c0fcaa5..00000000000
Binary files a/release/datafiles/studiolights/matcap/mc23.jpg and /dev/null differ
diff --git a/release/datafiles/studiolights/matcap/mc24.jpg b/release/datafiles/studiolights/matcap/mc24.jpg
deleted file mode 100644
index 2a9618d8fe1..00000000000
Binary files a/release/datafiles/studiol

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list