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.

1 files changed, 4 insertions, 3 deletions

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);
 	}