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.

33 files changed, 79 insertions, 6 deletions

diff --git a/SConstruct b/SConstruct
index eb22af1455b..acf948fe970 100644
--- a/SConstruct
+++ b/SConstruct
@@ -591,6 +591,14 @@ data_to_c_simple("release/datafiles/matcaps/mc13.jpg")
 data_to_c_simple("release/datafiles/matcaps/mc14.jpg")
 data_to_c_simple("release/datafiles/matcaps/mc15.jpg")
 data_to_c_simple("release/datafiles/matcaps/mc16.jpg")
+data_to_c_simple("release/datafiles/matcaps/mc17.jpg")
+data_to_c_simple("release/datafiles/matcaps/mc18.jpg")
+data_to_c_simple("release/datafiles/matcaps/mc19.jpg")
+data_to_c_simple("release/datafiles/matcaps/mc20.jpg")
+data_to_c_simple("release/datafiles/matcaps/mc21.jpg")
+data_to_c_simple("release/datafiles/matcaps/mc22.jpg")
+data_to_c_simple("release/datafiles/matcaps/mc23.jpg")
+data_to_c_simple("release/datafiles/matcaps/mc24.jpg")
 
 ##### END DATAFILES ##########
 
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt
index ed3088696b1..8d108644470 100644
--- a/source/blender/editors/datafiles/CMakeLists.txt
+++ b/source/blender/editors/datafiles/CMakeLists.txt
@@ -100,6 +100,14 @@ if(WITH_BLENDER)
 		data_to_c_simple(../../../../release/datafiles/matcaps/mc14.jpg SRC)
 		data_to_c_simple(../../../../release/datafiles/matcaps/mc15.jpg SRC)
 		data_to_c_simple(../../../../release/datafiles/matcaps/mc16.jpg SRC)
+		data_to_c_simple(../../../../release/datafiles/matcaps/mc17.jpg SRC)
+		data_to_c_simple(../../../../release/datafiles/matcaps/mc18.jpg SRC)
+		data_to_c_simple(../../../../release/datafiles/matcaps/mc19.jpg SRC)
+		data_to_c_simple(../../../../release/datafiles/matcaps/mc20.jpg SRC)
+		data_to_c_simple(../../../../release/datafiles/matcaps/mc21.jpg SRC)
+		data_to_c_simple(../../../../release/datafiles/matcaps/mc22.jpg SRC)
+		data_to_c_simple(../../../../release/datafiles/matcaps/mc23.jpg SRC)
+		data_to_c_simple(../../../../release/datafiles/matcaps/mc24.jpg SRC)
 
 	endif()
 
diff --git a/source/blender/editors/datafiles/SConscript b/source/blender/editors/datafiles/SConscript
index fb1f9f37975..c17ab386fe6 100644
--- a/source/blender/editors/datafiles/SConscript
+++ b/source/blender/editors/datafiles/SConscript
@@ -95,6 +95,14 @@ sources.extend((
 	os.path.join(env['DATA_SOURCES'], "mc14.jpg.c"),
 	os.path.join(env['DATA_SOURCES'], "mc15.jpg.c"),
 	os.path.join(env['DATA_SOURCES'], "mc16.jpg.c"),
+	os.path.join(env['DATA_SOURCES'], "mc17.jpg.c"),
+	os.path.join(env['DATA_SOURCES'], "mc18.jpg.c"),
+	os.path.join(env['DATA_SOURCES'], "mc19.jpg.c"),
+	os.path.join(env['DATA_SOURCES'], "mc20.jpg.c"),
+	os.path.join(env['DATA_SOURCES'], "mc21.jpg.c"),
+	os.path.join(env['DATA_SOURCES'], "mc22.jpg.c"),
+	os.path.join(env['DATA_SOURCES'], "mc23.jpg.c"),
+	os.path.join(env['DATA_SOURCES'], "mc24.jpg.c"),
 
 	))
 
diff --git a/source/blender/editors/include/ED_datafiles.h b/source/blender/editors/include/ED_datafiles.h
index 19552d60387..81dbb8e9aa5 100644
--- a/source/blender/editors/include/ED_datafiles.h
+++ b/source/blender/editors/include/ED_datafiles.h
@@ -206,6 +206,30 @@ extern char datatoc_mc15_jpg[];
 extern int datatoc_mc16_jpg_size;
 extern char datatoc_mc16_jpg[];
 
+extern int datatoc_mc17_jpg_size;
+extern char datatoc_mc17_jpg[];
+
+extern int datatoc_mc18_jpg_size;
+extern char datatoc_mc18_jpg[];
+
+extern int datatoc_mc19_jpg_size;
+extern char datatoc_mc19_jpg[];
+
+extern int datatoc_mc20_jpg_size;
+extern char datatoc_mc20_jpg[];
+
+extern int datatoc_mc21_jpg_size;
+extern char datatoc_mc21_jpg[];
+
+extern int datatoc_mc22_jpg_size;
+extern char datatoc_mc22_jpg[];
+
+extern int datatoc_mc23_jpg_size;
+extern char datatoc_mc23_jpg[];
+
+extern int datatoc_mc24_jpg_size;
+extern char datatoc_mc24_jpg[];
+
 
 
 #endif /* __ED_DATAFILES_H__ */
diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h
index f5ac3f19b5b..0560cbd69cc 100644
--- a/source/blender/editors/include/UI_icons.h
+++ b/source/blender/editors/include/UI_icons.h
@@ -1007,6 +1007,14 @@ DEF_ICON(MATCAP_13)
 DEF_ICON(MATCAP_14)
 DEF_ICON(MATCAP_15)
 DEF_ICON(MATCAP_16)
+DEF_ICON(MATCAP_17)
+DEF_ICON(MATCAP_18)
+DEF_ICON(MATCAP_19)
+DEF_ICON(MATCAP_20)
+DEF_ICON(MATCAP_21)
+DEF_ICON(MATCAP_22)
+DEF_ICON(MATCAP_23)
+DEF_ICON(MATCAP_24)
 
 /* vector icons, VICO_ prefix added */	
 DEF_VICO(VIEW3D_VEC)
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c
index 1a3d8d20d47..086e9dad895 100644
--- a/source/blender/editors/interface/interface_icons.c
+++ b/source/blender/editors/interface/interface_icons.c
@@ -533,7 +533,7 @@ static void icon_verify_datatoc(IconImage *iimg)
 		                                    iimg->datatoc_size, IB_rect, NULL, "<matcap icon>");
 		/* w and h were set on initialize */
 		if (bbuf->x != iimg->h && bbuf->y != iimg->w)
-			IMB_scalefastImBuf(bbuf, iimg->w, iimg->h);
+			IMB_scaleImBuf(bbuf, iimg->w, iimg->h);
 		
 		iimg->rect = bbuf->rect;
 		bbuf->rect = NULL;
@@ -550,7 +550,7 @@ static void init_matcap_icons(void)
 		int size = datatoc_ ##name## _jpg_size;                               \
 		DrawInfo *di;                                                         \
 		                                                                      \
-		di = def_internal_icon(NULL, icon_id, 0, 0, 128, ICON_TYPE_BUFFER);   \
+		di = def_internal_icon(NULL, icon_id, 0, 0, 96, ICON_TYPE_BUFFER);   \
 		di->data.buffer.image->datatoc_rect = rect;                           \
 		di->data.buffer.image->datatoc_size = size;                           \
 	} (void)0
@@ -571,6 +571,14 @@ static void init_matcap_icons(void)
 	INIT_MATCAP_ICON(ICON_MATCAP_14, mc14);
 	INIT_MATCAP_ICON(ICON_MATCAP_15, mc15);
 	INIT_MATCAP_ICON(ICON_MATCAP_16, mc16);
+	INIT_MATCAP_ICON(ICON_MATCAP_17, mc17);
+	INIT_MATCAP_ICON(ICON_MATCAP_18, mc18);
+	INIT_MATCAP_ICON(ICON_MATCAP_19, mc19);
+	INIT_MATCAP_ICON(ICON_MATCAP_20, mc20);
+	INIT_MATCAP_ICON(ICON_MATCAP_21, mc21);
+	INIT_MATCAP_ICON(ICON_MATCAP_22, mc22);
+	INIT_MATCAP_ICON(ICON_MATCAP_23, mc23);
+	INIT_MATCAP_ICON(ICON_MATCAP_24, mc24);
 
 #undef INIT_MATCAP_ICON
 
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index 26a8f703545..ff47d481fc8 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -1585,11 +1585,12 @@ static uiBlock *icon_view_menu(bContext *C, ARegion *ar, void *arg_litem)
 	for (a = 0; item[a].identifier; a++) {
 		int x, y;
 		
-		x = (a % 8) * UI_UNIT_X * 6;
-		y = (a / 8) * UI_UNIT_X * 6;
+		/* XXX hardcoded size to 5 x unit */
+		x = (a % 8) * UI_UNIT_X * 5;
+		y = (a / 8) * UI_UNIT_X * 5;
 		
 		icon = item[a].icon;
-		but = uiDefIconButR_prop(block, ROW, 0, icon, x, y, UI_UNIT_X * 6, UI_UNIT_Y * 6, &cb.ptr, cb.prop, -1, 0, icon, -1, -1, NULL);
+		but = uiDefIconButR_prop(block, ROW, 0, icon, x, y, UI_UNIT_X * 5, UI_UNIT_Y * 5, &cb.ptr, cb.prop, -1, 0, icon, -1, -1, NULL);
 		uiButSetFlag(but, UI_HAS_ICON | UI_ICON_PREVIEW);
 	}
 
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index 38112f95ec8..a742e6d4a1a 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -1550,6 +1550,14 @@ static void rna_def_space_view3d(BlenderRNA *brna)
 		{ICON_MATCAP_14, "14", ICON_MATCAP_14, "", ""},
 		{ICON_MATCAP_15, "15", ICON_MATCAP_15, "", ""},
 		{ICON_MATCAP_16, "16", ICON_MATCAP_16, "", ""},
+		{ICON_MATCAP_17, "17", ICON_MATCAP_17, "", ""},
+		{ICON_MATCAP_18, "18", ICON_MATCAP_18, "", ""},
+		{ICON_MATCAP_19, "19", ICON_MATCAP_19, "", ""},
+		{ICON_MATCAP_20, "20", ICON_MATCAP_20, "", ""},
+		{ICON_MATCAP_21, "21", ICON_MATCAP_21, "", ""},
+		{ICON_MATCAP_22, "22", ICON_MATCAP_22, "", ""},
+		{ICON_MATCAP_23, "23", ICON_MATCAP_23, "", ""},
+		{ICON_MATCAP_24, "24", ICON_MATCAP_24, "", ""},
 		{0, NULL, 0, NULL, NULL}
 	};