Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2018-07-30 14:43:06 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-07-30 14:54:46 +0300
commit6a493e44302588c35a269ed34a3e679c7912074b (patch)
treeb400259e12f37ad1e03c23a563bc0acb5c77bd0b /release/datafiles/studiolights/matcap
parentd01319df76496d2ded7643d5b38be394e5e29a0b (diff)
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
Diffstat (limited to 'release/datafiles/studiolights/matcap')
-rw-r--r--release/datafiles/studiolights/matcap/basic_1.exrbin0 -> 44539 bytes
-rw-r--r--release/datafiles/studiolights/matcap/basic_2.exrbin0 -> 61142 bytes
-rw-r--r--release/datafiles/studiolights/matcap/basic_dark.exrbin0 -> 38734 bytes
-rw-r--r--release/datafiles/studiolights/matcap/basic_side.exrbin0 -> 41554 bytes
-rw-r--r--release/datafiles/studiolights/matcap/ceramic_dark.exrbin0 -> 63518 bytes
-rw-r--r--release/datafiles/studiolights/matcap/ceramic_lightbulb.exrbin0 -> 102212 bytes
-rw-r--r--release/datafiles/studiolights/matcap/check_normal+y.exrbin0 -> 87477 bytes
-rw-r--r--release/datafiles/studiolights/matcap/check_reflection.exrbin0 -> 151596 bytes
-rw-r--r--release/datafiles/studiolights/matcap/check_rim_dark.exrbin0 -> 50807 bytes
-rw-r--r--release/datafiles/studiolights/matcap/check_rim_light.exrbin0 -> 56757 bytes
-rw-r--r--release/datafiles/studiolights/matcap/clay_brown.exrbin0 -> 65156 bytes
-rw-r--r--release/datafiles/studiolights/matcap/clay_muddy.exrbin0 -> 53778 bytes
-rw-r--r--release/datafiles/studiolights/matcap/clay_studio.exrbin0 -> 51624 bytes
-rw-r--r--release/datafiles/studiolights/matcap/jade.exrbin0 -> 63103 bytes
-rw-r--r--release/datafiles/studiolights/matcap/license.txt4
-rw-r--r--release/datafiles/studiolights/matcap/mc01.jpgbin20830 -> 0 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc02.jpgbin23428 -> 0 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc03.jpgbin17550 -> 0 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc04.jpgbin29197 -> 0 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc05.jpgbin25454 -> 0 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc06.jpgbin19864 -> 0 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc07.jpgbin59262 -> 0 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc08.jpgbin24133 -> 0 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc09.jpgbin31101 -> 0 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc10.jpgbin28973 -> 0 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc11.jpgbin21395 -> 0 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc12.jpgbin23797 -> 0 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc13.jpgbin45661 -> 0 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc14.jpgbin44762 -> 0 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc15.jpgbin27456 -> 0 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc16.jpgbin33401 -> 0 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc17.jpgbin49292 -> 0 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc18.jpgbin40254 -> 0 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc19.jpgbin46330 -> 0 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc20.jpgbin52893 -> 0 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc21.jpgbin28717 -> 0 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc22.jpgbin33801 -> 0 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc23.jpgbin26688 -> 0 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc24.jpgbin14149 -> 0 bytes
-rw-r--r--release/datafiles/studiolights/matcap/metal_anisotropic.exrbin0 -> 118909 bytes
-rw-r--r--release/datafiles/studiolights/matcap/metal_carpaint.exrbin0 -> 91775 bytes
-rw-r--r--release/datafiles/studiolights/matcap/metal_lead.exrbin0 -> 41455 bytes
-rw-r--r--release/datafiles/studiolights/matcap/metal_shiny.exrbin0 -> 126238 bytes
-rw-r--r--release/datafiles/studiolights/matcap/pearl.exrbin0 -> 70218 bytes
-rw-r--r--release/datafiles/studiolights/matcap/resin.exrbin0 -> 91009 bytes
-rw-r--r--release/datafiles/studiolights/matcap/skin.exrbin0 -> 55351 bytes
-rw-r--r--release/datafiles/studiolights/matcap/toon.exrbin0 -> 55733 bytes
47 files changed, 2 insertions, 2 deletions
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
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/basic_1.exr
Binary files 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
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/basic_2.exr
Binary files 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
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/basic_dark.exr
Binary files 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
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/basic_side.exr
Binary files 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
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/ceramic_dark.exr
Binary files 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
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/ceramic_lightbulb.exr
Binary files 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
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/check_normal+y.exr
Binary files 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
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/check_reflection.exr
Binary files 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
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/check_rim_dark.exr
Binary files 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
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/check_rim_light.exr
Binary files 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
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/clay_brown.exr
Binary files 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
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/clay_muddy.exr
Binary files 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
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/clay_studio.exr
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/jade.exr b/release/datafiles/studiolights/matcap/jade.exr
new file mode 100644
index 00000000000..fe1211f1b65
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/jade.exr
Binary files 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
--- a/release/datafiles/studiolights/matcap/mc01.jpg
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc02.jpg b/release/datafiles/studiolights/matcap/mc02.jpg
deleted file mode 100644
index 11deddfeaed..00000000000
--- a/release/datafiles/studiolights/matcap/mc02.jpg
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc03.jpg b/release/datafiles/studiolights/matcap/mc03.jpg
deleted file mode 100644
index 64d992fb61a..00000000000
--- a/release/datafiles/studiolights/matcap/mc03.jpg
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc04.jpg b/release/datafiles/studiolights/matcap/mc04.jpg
deleted file mode 100644
index 42be580ee93..00000000000
--- a/release/datafiles/studiolights/matcap/mc04.jpg
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc05.jpg b/release/datafiles/studiolights/matcap/mc05.jpg
deleted file mode 100644
index 586d233ef31..00000000000
--- a/release/datafiles/studiolights/matcap/mc05.jpg
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc06.jpg b/release/datafiles/studiolights/matcap/mc06.jpg
deleted file mode 100644
index 657883d0866..00000000000
--- a/release/datafiles/studiolights/matcap/mc06.jpg
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc07.jpg b/release/datafiles/studiolights/matcap/mc07.jpg
deleted file mode 100644
index 372caf7e87c..00000000000
--- a/release/datafiles/studiolights/matcap/mc07.jpg
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc08.jpg b/release/datafiles/studiolights/matcap/mc08.jpg
deleted file mode 100644
index 50eec402812..00000000000
--- a/release/datafiles/studiolights/matcap/mc08.jpg
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc09.jpg b/release/datafiles/studiolights/matcap/mc09.jpg
deleted file mode 100644
index e05d441aaf9..00000000000
--- a/release/datafiles/studiolights/matcap/mc09.jpg
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc10.jpg b/release/datafiles/studiolights/matcap/mc10.jpg
deleted file mode 100644
index ab82f17bb93..00000000000
--- a/release/datafiles/studiolights/matcap/mc10.jpg
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc11.jpg b/release/datafiles/studiolights/matcap/mc11.jpg
deleted file mode 100644
index 053550f082c..00000000000
--- a/release/datafiles/studiolights/matcap/mc11.jpg
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc12.jpg b/release/datafiles/studiolights/matcap/mc12.jpg
deleted file mode 100644
index beb16f3742e..00000000000
--- a/release/datafiles/studiolights/matcap/mc12.jpg
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc13.jpg b/release/datafiles/studiolights/matcap/mc13.jpg
deleted file mode 100644
index 7fb8fa58e8f..00000000000
--- a/release/datafiles/studiolights/matcap/mc13.jpg
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc14.jpg b/release/datafiles/studiolights/matcap/mc14.jpg
deleted file mode 100644
index ba868d2f95a..00000000000
--- a/release/datafiles/studiolights/matcap/mc14.jpg
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc15.jpg b/release/datafiles/studiolights/matcap/mc15.jpg
deleted file mode 100644
index b10ea326a42..00000000000
--- a/release/datafiles/studiolights/matcap/mc15.jpg
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc16.jpg b/release/datafiles/studiolights/matcap/mc16.jpg
deleted file mode 100644
index c6ce02d59df..00000000000
--- a/release/datafiles/studiolights/matcap/mc16.jpg
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc17.jpg b/release/datafiles/studiolights/matcap/mc17.jpg
deleted file mode 100644
index 14f15f70460..00000000000
--- a/release/datafiles/studiolights/matcap/mc17.jpg
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc18.jpg b/release/datafiles/studiolights/matcap/mc18.jpg
deleted file mode 100644
index db572856b07..00000000000
--- a/release/datafiles/studiolights/matcap/mc18.jpg
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc19.jpg b/release/datafiles/studiolights/matcap/mc19.jpg
deleted file mode 100644
index 56d2efb1734..00000000000
--- a/release/datafiles/studiolights/matcap/mc19.jpg
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc20.jpg b/release/datafiles/studiolights/matcap/mc20.jpg
deleted file mode 100644
index 002a0910dd9..00000000000
--- a/release/datafiles/studiolights/matcap/mc20.jpg
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc21.jpg b/release/datafiles/studiolights/matcap/mc21.jpg
deleted file mode 100644
index cb2fea573b8..00000000000
--- a/release/datafiles/studiolights/matcap/mc21.jpg
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc22.jpg b/release/datafiles/studiolights/matcap/mc22.jpg
deleted file mode 100644
index 2fc71b98c5a..00000000000
--- a/release/datafiles/studiolights/matcap/mc22.jpg
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc23.jpg b/release/datafiles/studiolights/matcap/mc23.jpg
deleted file mode 100644
index 3793c0fcaa5..00000000000
--- a/release/datafiles/studiolights/matcap/mc23.jpg
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc24.jpg b/release/datafiles/studiolights/matcap/mc24.jpg
deleted file mode 100644
index 2a9618d8fe1..00000000000
--- a/release/datafiles/studiolights/matcap/mc24.jpg
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/metal_anisotropic.exr b/release/datafiles/studiolights/matcap/metal_anisotropic.exr
new file mode 100644
index 00000000000..38ea94ac676
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/metal_anisotropic.exr
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/metal_carpaint.exr b/release/datafiles/studiolights/matcap/metal_carpaint.exr
new file mode 100644
index 00000000000..c5bcdf67abf
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/metal_carpaint.exr
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/metal_lead.exr b/release/datafiles/studiolights/matcap/metal_lead.exr
new file mode 100644
index 00000000000..4d6b2954ccd
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/metal_lead.exr
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/metal_shiny.exr b/release/datafiles/studiolights/matcap/metal_shiny.exr
new file mode 100644
index 00000000000..3b5d20ffda2
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/metal_shiny.exr
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/pearl.exr b/release/datafiles/studiolights/matcap/pearl.exr
new file mode 100644
index 00000000000..e657c67936e
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/pearl.exr
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/resin.exr b/release/datafiles/studiolights/matcap/resin.exr
new file mode 100644
index 00000000000..80e405aaa67
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/resin.exr
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/skin.exr b/release/datafiles/studiolights/matcap/skin.exr
new file mode 100644
index 00000000000..ffc3213dad9
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/skin.exr
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/toon.exr b/release/datafiles/studiolights/matcap/toon.exr
new file mode 100644
index 00000000000..242f5055e2b
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/toon.exr
Binary files differ