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:
authorTon Roosendaal <ton@blender.org>2013-02-05 20:16:07 +0400
committerTon Roosendaal <ton@blender.org>2013-02-05 20:16:07 +0400
commit134c656878f63e597b250fa2a89eaf9196120d57 (patch)
treef077a8e4bb202a7167bf655bad1a8beafe020f69 /release/datafiles
parentc8e0f993cdc04a5b05c3fb0e7bb5ee13e5fd13c3 (diff)
New matcap collection for default in release. It's now 24 images, ordered
from regular diffuse to more shiny, stone, wax, eflective, glass and two non-realistic ones. The menu now shows it in 3 rows. I made the previews a bit smaller, 96 pixels, like the brushes for painting. Thanks everyone for submitting pics! I updated the credit file too, but name from one person is missing still, will be added next.
Diffstat (limited to 'release/datafiles')
-rw-r--r--release/datafiles/matcaps/license.txt2
-rw-r--r--release/datafiles/matcaps/mc01.jpgbin21395 -> 20830 bytes
-rw-r--r--release/datafiles/matcaps/mc02.jpgbin40254 -> 23428 bytes
-rw-r--r--release/datafiles/matcaps/mc03.jpgbin49292 -> 17550 bytes
-rw-r--r--release/datafiles/matcaps/mc04.jpgbin46330 -> 29197 bytes
-rw-r--r--release/datafiles/matcaps/mc05.jpgbin20830 -> 25454 bytes
-rw-r--r--release/datafiles/matcaps/mc06.jpgbin59262 -> 19864 bytes
-rw-r--r--release/datafiles/matcaps/mc07.jpgbin26688 -> 59262 bytes
-rw-r--r--release/datafiles/matcaps/mc08.jpgbin44762 -> 24133 bytes
-rw-r--r--release/datafiles/matcaps/mc09.jpgbin55815 -> 31101 bytes
-rw-r--r--release/datafiles/matcaps/mc10.jpgbin24133 -> 28973 bytes
-rw-r--r--release/datafiles/matcaps/mc11.jpgbin31101 -> 21395 bytes
-rw-r--r--release/datafiles/matcaps/mc12.jpgbin52893 -> 23797 bytes
-rw-r--r--release/datafiles/matcaps/mc13.jpgbin29197 -> 45661 bytes
-rw-r--r--release/datafiles/matcaps/mc14.jpgbin25454 -> 44762 bytes
-rw-r--r--release/datafiles/matcaps/mc15.jpgbin33401 -> 27456 bytes
-rw-r--r--release/datafiles/matcaps/mc16.jpgbin27456 -> 33401 bytes
-rw-r--r--release/datafiles/matcaps/mc17.jpgbin0 -> 49292 bytes
-rw-r--r--release/datafiles/matcaps/mc18.jpgbin0 -> 40254 bytes
-rw-r--r--release/datafiles/matcaps/mc19.jpgbin0 -> 46330 bytes
-rw-r--r--release/datafiles/matcaps/mc20.jpgbin0 -> 52893 bytes
-rw-r--r--release/datafiles/matcaps/mc21.jpgbin0 -> 28717 bytes
-rw-r--r--release/datafiles/matcaps/mc22.jpgbin0 -> 33801 bytes
-rw-r--r--release/datafiles/matcaps/mc23.jpgbin0 -> 26688 bytes
-rw-r--r--release/datafiles/matcaps/mc24.jpgbin0 -> 14149 bytes
25 files changed, 1 insertions, 1 deletions
diff --git a/release/datafiles/matcaps/license.txt b/release/datafiles/matcaps/license.txt
index fb9186d7acc..2670a62e311 100644
--- a/release/datafiles/matcaps/license.txt
+++ b/release/datafiles/matcaps/license.txt
@@ -1,3 +1,3 @@
These matcap images are licensed as GNU GPL 2 or later, like the rest of Blender's code.
-Thanks to Kent Trammell and Aidy Burrows and John Herreno for making the pictures.
+Thanks to Kent Trammell, Aidy Burrows, John Herreno , Terry Wallwork for making the pictures.
diff --git a/release/datafiles/matcaps/mc01.jpg b/release/datafiles/matcaps/mc01.jpg
index 053550f082c..8c7aef287ee 100644
--- a/release/datafiles/matcaps/mc01.jpg
+++ b/release/datafiles/matcaps/mc01.jpg
Binary files differ
diff --git a/release/datafiles/matcaps/mc02.jpg b/release/datafiles/matcaps/mc02.jpg
index db572856b07..11deddfeaed 100644
--- a/release/datafiles/matcaps/mc02.jpg
+++ b/release/datafiles/matcaps/mc02.jpg
Binary files differ
diff --git a/release/datafiles/matcaps/mc03.jpg b/release/datafiles/matcaps/mc03.jpg
index 14f15f70460..64d992fb61a 100644
--- a/release/datafiles/matcaps/mc03.jpg
+++ b/release/datafiles/matcaps/mc03.jpg
Binary files differ
diff --git a/release/datafiles/matcaps/mc04.jpg b/release/datafiles/matcaps/mc04.jpg
index 56d2efb1734..42be580ee93 100644
--- a/release/datafiles/matcaps/mc04.jpg
+++ b/release/datafiles/matcaps/mc04.jpg
Binary files differ
diff --git a/release/datafiles/matcaps/mc05.jpg b/release/datafiles/matcaps/mc05.jpg
index 8c7aef287ee..586d233ef31 100644
--- a/release/datafiles/matcaps/mc05.jpg
+++ b/release/datafiles/matcaps/mc05.jpg
Binary files differ
diff --git a/release/datafiles/matcaps/mc06.jpg b/release/datafiles/matcaps/mc06.jpg
index 372caf7e87c..657883d0866 100644
--- a/release/datafiles/matcaps/mc06.jpg
+++ b/release/datafiles/matcaps/mc06.jpg
Binary files differ
diff --git a/release/datafiles/matcaps/mc07.jpg b/release/datafiles/matcaps/mc07.jpg
index 3793c0fcaa5..372caf7e87c 100644
--- a/release/datafiles/matcaps/mc07.jpg
+++ b/release/datafiles/matcaps/mc07.jpg
Binary files differ
diff --git a/release/datafiles/matcaps/mc08.jpg b/release/datafiles/matcaps/mc08.jpg
index ba868d2f95a..50eec402812 100644
--- a/release/datafiles/matcaps/mc08.jpg
+++ b/release/datafiles/matcaps/mc08.jpg
Binary files differ
diff --git a/release/datafiles/matcaps/mc09.jpg b/release/datafiles/matcaps/mc09.jpg
index ed6a6bfeff8..e05d441aaf9 100644
--- a/release/datafiles/matcaps/mc09.jpg
+++ b/release/datafiles/matcaps/mc09.jpg
Binary files differ
diff --git a/release/datafiles/matcaps/mc10.jpg b/release/datafiles/matcaps/mc10.jpg
index 50eec402812..ab82f17bb93 100644
--- a/release/datafiles/matcaps/mc10.jpg
+++ b/release/datafiles/matcaps/mc10.jpg
Binary files differ
diff --git a/release/datafiles/matcaps/mc11.jpg b/release/datafiles/matcaps/mc11.jpg
index e05d441aaf9..053550f082c 100644
--- a/release/datafiles/matcaps/mc11.jpg
+++ b/release/datafiles/matcaps/mc11.jpg
Binary files differ
diff --git a/release/datafiles/matcaps/mc12.jpg b/release/datafiles/matcaps/mc12.jpg
index 002a0910dd9..beb16f3742e 100644
--- a/release/datafiles/matcaps/mc12.jpg
+++ b/release/datafiles/matcaps/mc12.jpg
Binary files differ
diff --git a/release/datafiles/matcaps/mc13.jpg b/release/datafiles/matcaps/mc13.jpg
index 42be580ee93..7fb8fa58e8f 100644
--- a/release/datafiles/matcaps/mc13.jpg
+++ b/release/datafiles/matcaps/mc13.jpg
Binary files differ
diff --git a/release/datafiles/matcaps/mc14.jpg b/release/datafiles/matcaps/mc14.jpg
index 586d233ef31..ba868d2f95a 100644
--- a/release/datafiles/matcaps/mc14.jpg
+++ b/release/datafiles/matcaps/mc14.jpg
Binary files differ
diff --git a/release/datafiles/matcaps/mc15.jpg b/release/datafiles/matcaps/mc15.jpg
index c6ce02d59df..b10ea326a42 100644
--- a/release/datafiles/matcaps/mc15.jpg
+++ b/release/datafiles/matcaps/mc15.jpg
Binary files differ
diff --git a/release/datafiles/matcaps/mc16.jpg b/release/datafiles/matcaps/mc16.jpg
index b10ea326a42..c6ce02d59df 100644
--- a/release/datafiles/matcaps/mc16.jpg
+++ b/release/datafiles/matcaps/mc16.jpg
Binary files differ
diff --git a/release/datafiles/matcaps/mc17.jpg b/release/datafiles/matcaps/mc17.jpg
new file mode 100644
index 00000000000..14f15f70460
--- /dev/null
+++ b/release/datafiles/matcaps/mc17.jpg
Binary files differ
diff --git a/release/datafiles/matcaps/mc18.jpg b/release/datafiles/matcaps/mc18.jpg
new file mode 100644
index 00000000000..db572856b07
--- /dev/null
+++ b/release/datafiles/matcaps/mc18.jpg
Binary files differ
diff --git a/release/datafiles/matcaps/mc19.jpg b/release/datafiles/matcaps/mc19.jpg
new file mode 100644
index 00000000000..56d2efb1734
--- /dev/null
+++ b/release/datafiles/matcaps/mc19.jpg
Binary files differ
diff --git a/release/datafiles/matcaps/mc20.jpg b/release/datafiles/matcaps/mc20.jpg
new file mode 100644
index 00000000000..002a0910dd9
--- /dev/null
+++ b/release/datafiles/matcaps/mc20.jpg
Binary files differ
diff --git a/release/datafiles/matcaps/mc21.jpg b/release/datafiles/matcaps/mc21.jpg
new file mode 100644
index 00000000000..cb2fea573b8
--- /dev/null
+++ b/release/datafiles/matcaps/mc21.jpg
Binary files differ
diff --git a/release/datafiles/matcaps/mc22.jpg b/release/datafiles/matcaps/mc22.jpg
new file mode 100644
index 00000000000..2fc71b98c5a
--- /dev/null
+++ b/release/datafiles/matcaps/mc22.jpg
Binary files differ
diff --git a/release/datafiles/matcaps/mc23.jpg b/release/datafiles/matcaps/mc23.jpg
new file mode 100644
index 00000000000..3793c0fcaa5
--- /dev/null
+++ b/release/datafiles/matcaps/mc23.jpg
Binary files differ
diff --git a/release/datafiles/matcaps/mc24.jpg b/release/datafiles/matcaps/mc24.jpg
new file mode 100644
index 00000000000..2a9618d8fe1
--- /dev/null
+++ b/release/datafiles/matcaps/mc24.jpg
Binary files differ