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:
authorJeroen Bakker <j.bakker@atmind.nl>2018-06-05 09:15:30 +0300
committerJeroen Bakker <j.bakker@atmind.nl>2018-06-05 12:38:33 +0300
commita3815f87773c7d45740c98c888718424d736870b (patch)
tree4cd46cb327fe76e1dfcde04dcdd99d1cc4a2e9b5 /release/datafiles/studiolights
parentade710500df4f333077daa96e3ab72eb2cdc3b94 (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/datafiles/studiolights')
-rw-r--r--release/datafiles/studiolights/matcap/license.txt3
-rw-r--r--release/datafiles/studiolights/matcap/mc01.jpgbin0 -> 20830 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc02.jpgbin0 -> 23428 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc03.jpgbin0 -> 17550 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc04.jpgbin0 -> 29197 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc05.jpgbin0 -> 25454 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc06.jpgbin0 -> 19864 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc07.jpgbin0 -> 59262 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc08.jpgbin0 -> 24133 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc09.jpgbin0 -> 31101 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc10.jpgbin0 -> 28973 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc11.jpgbin0 -> 21395 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc12.jpgbin0 -> 23797 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc13.jpgbin0 -> 45661 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc14.jpgbin0 -> 44762 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc15.jpgbin0 -> 27456 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc16.jpgbin0 -> 33401 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc17.jpgbin0 -> 49292 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc18.jpgbin0 -> 40254 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc19.jpgbin0 -> 46330 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc20.jpgbin0 -> 52893 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc21.jpgbin0 -> 28717 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc22.jpgbin0 -> 33801 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc23.jpgbin0 -> 26688 bytes
-rw-r--r--release/datafiles/studiolights/matcap/mc24.jpgbin0 -> 14149 bytes
25 files changed, 3 insertions, 0 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
new file mode 100644
index 00000000000..8c7aef287ee
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/mc01.jpg
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc02.jpg b/release/datafiles/studiolights/matcap/mc02.jpg
new file mode 100644
index 00000000000..11deddfeaed
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/mc02.jpg
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc03.jpg b/release/datafiles/studiolights/matcap/mc03.jpg
new file mode 100644
index 00000000000..64d992fb61a
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/mc03.jpg
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc04.jpg b/release/datafiles/studiolights/matcap/mc04.jpg
new file mode 100644
index 00000000000..42be580ee93
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/mc04.jpg
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc05.jpg b/release/datafiles/studiolights/matcap/mc05.jpg
new file mode 100644
index 00000000000..586d233ef31
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/mc05.jpg
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc06.jpg b/release/datafiles/studiolights/matcap/mc06.jpg
new file mode 100644
index 00000000000..657883d0866
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/mc06.jpg
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc07.jpg b/release/datafiles/studiolights/matcap/mc07.jpg
new file mode 100644
index 00000000000..372caf7e87c
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/mc07.jpg
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc08.jpg b/release/datafiles/studiolights/matcap/mc08.jpg
new file mode 100644
index 00000000000..50eec402812
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/mc08.jpg
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc09.jpg b/release/datafiles/studiolights/matcap/mc09.jpg
new file mode 100644
index 00000000000..e05d441aaf9
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/mc09.jpg
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc10.jpg b/release/datafiles/studiolights/matcap/mc10.jpg
new file mode 100644
index 00000000000..ab82f17bb93
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/mc10.jpg
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc11.jpg b/release/datafiles/studiolights/matcap/mc11.jpg
new file mode 100644
index 00000000000..053550f082c
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/mc11.jpg
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc12.jpg b/release/datafiles/studiolights/matcap/mc12.jpg
new file mode 100644
index 00000000000..beb16f3742e
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/mc12.jpg
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc13.jpg b/release/datafiles/studiolights/matcap/mc13.jpg
new file mode 100644
index 00000000000..7fb8fa58e8f
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/mc13.jpg
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc14.jpg b/release/datafiles/studiolights/matcap/mc14.jpg
new file mode 100644
index 00000000000..ba868d2f95a
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/mc14.jpg
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc15.jpg b/release/datafiles/studiolights/matcap/mc15.jpg
new file mode 100644
index 00000000000..b10ea326a42
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/mc15.jpg
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc16.jpg b/release/datafiles/studiolights/matcap/mc16.jpg
new file mode 100644
index 00000000000..c6ce02d59df
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/mc16.jpg
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc17.jpg b/release/datafiles/studiolights/matcap/mc17.jpg
new file mode 100644
index 00000000000..14f15f70460
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/mc17.jpg
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc18.jpg b/release/datafiles/studiolights/matcap/mc18.jpg
new file mode 100644
index 00000000000..db572856b07
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/mc18.jpg
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc19.jpg b/release/datafiles/studiolights/matcap/mc19.jpg
new file mode 100644
index 00000000000..56d2efb1734
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/mc19.jpg
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc20.jpg b/release/datafiles/studiolights/matcap/mc20.jpg
new file mode 100644
index 00000000000..002a0910dd9
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/mc20.jpg
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc21.jpg b/release/datafiles/studiolights/matcap/mc21.jpg
new file mode 100644
index 00000000000..cb2fea573b8
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/mc21.jpg
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc22.jpg b/release/datafiles/studiolights/matcap/mc22.jpg
new file mode 100644
index 00000000000..2fc71b98c5a
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/mc22.jpg
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc23.jpg b/release/datafiles/studiolights/matcap/mc23.jpg
new file mode 100644
index 00000000000..3793c0fcaa5
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/mc23.jpg
Binary files differ
diff --git a/release/datafiles/studiolights/matcap/mc24.jpg b/release/datafiles/studiolights/matcap/mc24.jpg
new file mode 100644
index 00000000000..2a9618d8fe1
--- /dev/null
+++ b/release/datafiles/studiolights/matcap/mc24.jpg
Binary files differ