Viewport: add new default set of matcaps.
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Mon, 30 Jul 2018 11:43:06 +0000 (13:43 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Mon, 30 Jul 2018 11:54:46 +0000 (13:54 +0200)
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

47 files changed:
release/datafiles/studiolights/matcap/basic_1.exr [new file with mode: 0644]
release/datafiles/studiolights/matcap/basic_2.exr [new file with mode: 0644]
release/datafiles/studiolights/matcap/basic_dark.exr [new file with mode: 0644]
release/datafiles/studiolights/matcap/basic_side.exr [new file with mode: 0644]
release/datafiles/studiolights/matcap/ceramic_dark.exr [new file with mode: 0644]
release/datafiles/studiolights/matcap/ceramic_lightbulb.exr [new file with mode: 0644]
release/datafiles/studiolights/matcap/check_normal+y.exr [new file with mode: 0644]
release/datafiles/studiolights/matcap/check_reflection.exr [new file with mode: 0644]
release/datafiles/studiolights/matcap/check_rim_dark.exr [new file with mode: 0644]
release/datafiles/studiolights/matcap/check_rim_light.exr [new file with mode: 0644]
release/datafiles/studiolights/matcap/clay_brown.exr [new file with mode: 0644]
release/datafiles/studiolights/matcap/clay_muddy.exr [new file with mode: 0644]
release/datafiles/studiolights/matcap/clay_studio.exr [new file with mode: 0644]
release/datafiles/studiolights/matcap/jade.exr [new file with mode: 0644]
release/datafiles/studiolights/matcap/license.txt
release/datafiles/studiolights/matcap/mc01.jpg [deleted file]
release/datafiles/studiolights/matcap/mc02.jpg [deleted file]
release/datafiles/studiolights/matcap/mc03.jpg [deleted file]
release/datafiles/studiolights/matcap/mc04.jpg [deleted file]
release/datafiles/studiolights/matcap/mc05.jpg [deleted file]
release/datafiles/studiolights/matcap/mc06.jpg [deleted file]
release/datafiles/studiolights/matcap/mc07.jpg [deleted file]
release/datafiles/studiolights/matcap/mc08.jpg [deleted file]
release/datafiles/studiolights/matcap/mc09.jpg [deleted file]
release/datafiles/studiolights/matcap/mc10.jpg [deleted file]
release/datafiles/studiolights/matcap/mc11.jpg [deleted file]
release/datafiles/studiolights/matcap/mc12.jpg [deleted file]
release/datafiles/studiolights/matcap/mc13.jpg [deleted file]
release/datafiles/studiolights/matcap/mc14.jpg [deleted file]
release/datafiles/studiolights/matcap/mc15.jpg [deleted file]
release/datafiles/studiolights/matcap/mc16.jpg [deleted file]
release/datafiles/studiolights/matcap/mc17.jpg [deleted file]
release/datafiles/studiolights/matcap/mc18.jpg [deleted file]
release/datafiles/studiolights/matcap/mc19.jpg [deleted file]
release/datafiles/studiolights/matcap/mc20.jpg [deleted file]
release/datafiles/studiolights/matcap/mc21.jpg [deleted file]
release/datafiles/studiolights/matcap/mc22.jpg [deleted file]
release/datafiles/studiolights/matcap/mc23.jpg [deleted file]
release/datafiles/studiolights/matcap/mc24.jpg [deleted file]
release/datafiles/studiolights/matcap/metal_anisotropic.exr [new file with mode: 0644]
release/datafiles/studiolights/matcap/metal_carpaint.exr [new file with mode: 0644]
release/datafiles/studiolights/matcap/metal_lead.exr [new file with mode: 0644]
release/datafiles/studiolights/matcap/metal_shiny.exr [new file with mode: 0644]
release/datafiles/studiolights/matcap/pearl.exr [new file with mode: 0644]
release/datafiles/studiolights/matcap/resin.exr [new file with mode: 0644]
release/datafiles/studiolights/matcap/skin.exr [new file with mode: 0644]
release/datafiles/studiolights/matcap/toon.exr [new file with mode: 0644]

diff --git a/release/datafiles/studiolights/matcap/basic_1.exr b/release/datafiles/studiolights/matcap/basic_1.exr
new file mode 100644 (file)
index 0000000..bb2e09a
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 (file)
index 0000000..d97f763
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 (file)
index 0000000..b623c80
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 (file)
index 0000000..6e4452e
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 (file)
index 0000000..837b020
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 (file)
index 0000000..e05b661
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 (file)
index 0000000..4e2a97a
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 (file)
index 0000000..245d605
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 (file)
index 0000000..e6a3200
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 (file)
index 0000000..6318c0f
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 (file)
index 0000000..fe1e030
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 (file)
index 0000000..d219578
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 (file)
index 0000000..7746e6d
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 (file)
index 0000000..fe1211f
Binary files /dev/null and b/release/datafiles/studiolights/matcap/jade.exr differ
index 358c8dcd832df4cf395bc376a82fdde7f437420c..09a0f7a439e7fb78b1be326e308a96f7e27caf65 100644 (file)
@@ -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 (file)
index 8c7aef2..0000000
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 (file)
index 11deddf..0000000
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 (file)
index 64d992f..0000000
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 (file)
index 42be580..0000000
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 (file)
index 586d233..0000000
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 (file)
index 657883d..0000000
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 (file)
index 372caf7..0000000
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 (file)
index 50eec40..0000000
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 (file)
index e05d441..0000000
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 (file)
index ab82f17..0000000
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 (file)
index 053550f..0000000
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 (file)
index beb16f3..0000000
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 (file)
index 7fb8fa5..0000000
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 (file)
index ba868d2..0000000
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 (file)
index b10ea32..0000000
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 (file)
index c6ce02d..0000000
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 (file)
index 14f15f7..0000000
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 (file)
index db57285..0000000
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 (file)
index 56d2efb..0000000
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 (file)
index 002a091..0000000
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 (file)
index cb2fea5..0000000
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 (file)
index 2fc71b9..0000000
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 (file)
index 3793c0f..0000000
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 (file)
index 2a9618d..0000000
Binary files a/release/datafiles/studiolights/matcap/mc24.jpg and /dev/null differ
diff --git a/release/datafiles/studiolights/matcap/metal_anisotropic.exr b/release/datafiles/studiolights/matcap/metal_anisotropic.exr
new file mode 100644 (file)
index 0000000..38ea94a
Binary files /dev/null and b/release/datafiles/studiolights/matcap/metal_anisotropic.exr differ
diff --git a/release/datafiles/studiolights/matcap/metal_carpaint.exr b/release/datafiles/studiolights/matcap/metal_carpaint.exr
new file mode 100644 (file)
index 0000000..c5bcdf6
Binary files /dev/null and b/release/datafiles/studiolights/matcap/metal_carpaint.exr differ
diff --git a/release/datafiles/studiolights/matcap/metal_lead.exr b/release/datafiles/studiolights/matcap/metal_lead.exr
new file mode 100644 (file)
index 0000000..4d6b295
Binary files /dev/null and b/release/datafiles/studiolights/matcap/metal_lead.exr differ
diff --git a/release/datafiles/studiolights/matcap/metal_shiny.exr b/release/datafiles/studiolights/matcap/metal_shiny.exr
new file mode 100644 (file)
index 0000000..3b5d20f
Binary files /dev/null and b/release/datafiles/studiolights/matcap/metal_shiny.exr differ
diff --git a/release/datafiles/studiolights/matcap/pearl.exr b/release/datafiles/studiolights/matcap/pearl.exr
new file mode 100644 (file)
index 0000000..e657c67
Binary files /dev/null and b/release/datafiles/studiolights/matcap/pearl.exr differ
diff --git a/release/datafiles/studiolights/matcap/resin.exr b/release/datafiles/studiolights/matcap/resin.exr
new file mode 100644 (file)
index 0000000..80e405a
Binary files /dev/null and b/release/datafiles/studiolights/matcap/resin.exr differ
diff --git a/release/datafiles/studiolights/matcap/skin.exr b/release/datafiles/studiolights/matcap/skin.exr
new file mode 100644 (file)
index 0000000..ffc3213
Binary files /dev/null and b/release/datafiles/studiolights/matcap/skin.exr differ
diff --git a/release/datafiles/studiolights/matcap/toon.exr b/release/datafiles/studiolights/matcap/toon.exr
new file mode 100644 (file)
index 0000000..242f505
Binary files /dev/null and b/release/datafiles/studiolights/matcap/toon.exr differ