New matcap collection for default in release. It's now 24 images, ordered
authorTon Roosendaal <ton@blender.org>
Tue, 5 Feb 2013 16:16:07 +0000 (16:16 +0000)
committerTon Roosendaal <ton@blender.org>
Tue, 5 Feb 2013 16:16:07 +0000 (16:16 +0000)
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:
SConstruct
release/datafiles/matcaps/license.txt
release/datafiles/matcaps/mc01.jpg
release/datafiles/matcaps/mc02.jpg
release/datafiles/matcaps/mc03.jpg
release/datafiles/matcaps/mc04.jpg
release/datafiles/matcaps/mc05.jpg
release/datafiles/matcaps/mc06.jpg
release/datafiles/matcaps/mc07.jpg
release/datafiles/matcaps/mc08.jpg
release/datafiles/matcaps/mc09.jpg
release/datafiles/matcaps/mc10.jpg
release/datafiles/matcaps/mc11.jpg
release/datafiles/matcaps/mc12.jpg
release/datafiles/matcaps/mc13.jpg
release/datafiles/matcaps/mc14.jpg
release/datafiles/matcaps/mc15.jpg
release/datafiles/matcaps/mc16.jpg
release/datafiles/matcaps/mc17.jpg [new file with mode: 0644]
release/datafiles/matcaps/mc18.jpg [new file with mode: 0644]
release/datafiles/matcaps/mc19.jpg [new file with mode: 0644]
release/datafiles/matcaps/mc20.jpg [new file with mode: 0644]
release/datafiles/matcaps/mc21.jpg [new file with mode: 0644]
release/datafiles/matcaps/mc22.jpg [new file with mode: 0644]
release/datafiles/matcaps/mc23.jpg [new file with mode: 0644]
release/datafiles/matcaps/mc24.jpg [new file with mode: 0644]
source/blender/editors/datafiles/CMakeLists.txt
source/blender/editors/datafiles/SConscript
source/blender/editors/include/ED_datafiles.h
source/blender/editors/include/UI_icons.h
source/blender/editors/interface/interface_icons.c
source/blender/editors/interface/interface_templates.c
source/blender/makesrna/intern/rna_space.c

index eb22af1455b8d1bf5de778748f5bebffdf565202..acf948fe970887905104eef49c7e7bc3eafd412c 100644 (file)
@@ -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 ##########
 
index fb9186d7acc0cfc1d225630fa13e50d2d43045b2..2670a62e31118eee5c1da098527d89a326d440f1 100644 (file)
@@ -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.
index 053550f082cd3e7622fdad199aa62285024b5710..8c7aef287eee7554e297476609c4362371e480f5 100644 (file)
Binary files a/release/datafiles/matcaps/mc01.jpg and b/release/datafiles/matcaps/mc01.jpg differ
index db572856b07b7f92003c6718fc8dd7d442cd6e33..11deddfeaedeba0061b5bfd8539ebd9fcbdeca3d 100644 (file)
Binary files a/release/datafiles/matcaps/mc02.jpg and b/release/datafiles/matcaps/mc02.jpg differ
index 14f15f704601bfb83d3b9af1803b24c94dcc0017..64d992fb61ab97f85f7b85e5c97f1d9767fa2982 100644 (file)
Binary files a/release/datafiles/matcaps/mc03.jpg and b/release/datafiles/matcaps/mc03.jpg differ
index 56d2efb173488e845fa709e3478a701f3a5647b0..42be580ee93030fa413808cb2a0dd6fb35da7319 100644 (file)
Binary files a/release/datafiles/matcaps/mc04.jpg and b/release/datafiles/matcaps/mc04.jpg differ
index 8c7aef287eee7554e297476609c4362371e480f5..586d233ef316bf926418be5748fde281e06010f2 100644 (file)
Binary files a/release/datafiles/matcaps/mc05.jpg and b/release/datafiles/matcaps/mc05.jpg differ
index 372caf7e87ca91c6ad44ba97e38b08b4ec24bb08..657883d0866bb86a32cc7d99357c6c3f685ca7c8 100644 (file)
Binary files a/release/datafiles/matcaps/mc06.jpg and b/release/datafiles/matcaps/mc06.jpg differ
index 3793c0fcaa573b72626fcb3bed982be23dfeabd1..372caf7e87ca91c6ad44ba97e38b08b4ec24bb08 100644 (file)
Binary files a/release/datafiles/matcaps/mc07.jpg and b/release/datafiles/matcaps/mc07.jpg differ
index ba868d2f95abd9404d4d55f95c2d7f1ceb41f1c8..50eec402812879ecffb714f78af37b7a97088462 100644 (file)
Binary files a/release/datafiles/matcaps/mc08.jpg and b/release/datafiles/matcaps/mc08.jpg differ
index ed6a6bfeff85864e6f536452e996638f602023fb..e05d441aaf94b489efdeef6ced43e249b3c17f30 100644 (file)
Binary files a/release/datafiles/matcaps/mc09.jpg and b/release/datafiles/matcaps/mc09.jpg differ
index 50eec402812879ecffb714f78af37b7a97088462..ab82f17bb934f415516d79711abdd50c12310aa9 100644 (file)
Binary files a/release/datafiles/matcaps/mc10.jpg and b/release/datafiles/matcaps/mc10.jpg differ
index e05d441aaf94b489efdeef6ced43e249b3c17f30..053550f082cd3e7622fdad199aa62285024b5710 100644 (file)
Binary files a/release/datafiles/matcaps/mc11.jpg and b/release/datafiles/matcaps/mc11.jpg differ
index 002a0910dd9aeb15acbcd423024cbd1d03627e28..beb16f3742e0f57ebd5a9b70c5b1d19a7914a3a8 100644 (file)
Binary files a/release/datafiles/matcaps/mc12.jpg and b/release/datafiles/matcaps/mc12.jpg differ
index 42be580ee93030fa413808cb2a0dd6fb35da7319..7fb8fa58e8f16ba7ba43facecf0f18ccfd732225 100644 (file)
Binary files a/release/datafiles/matcaps/mc13.jpg and b/release/datafiles/matcaps/mc13.jpg differ
index 586d233ef316bf926418be5748fde281e06010f2..ba868d2f95abd9404d4d55f95c2d7f1ceb41f1c8 100644 (file)
Binary files a/release/datafiles/matcaps/mc14.jpg and b/release/datafiles/matcaps/mc14.jpg differ
index c6ce02d59dfff87109f567a84068cf75f15615cf..b10ea326a421bf6222e7139f400ae68607fdb39d 100644 (file)
Binary files a/release/datafiles/matcaps/mc15.jpg and b/release/datafiles/matcaps/mc15.jpg differ
index b10ea326a421bf6222e7139f400ae68607fdb39d..c6ce02d59dfff87109f567a84068cf75f15615cf 100644 (file)
Binary files a/release/datafiles/matcaps/mc16.jpg and b/release/datafiles/matcaps/mc16.jpg differ
diff --git a/release/datafiles/matcaps/mc17.jpg b/release/datafiles/matcaps/mc17.jpg
new file mode 100644 (file)
index 0000000..14f15f7
Binary files /dev/null and b/release/datafiles/matcaps/mc17.jpg differ
diff --git a/release/datafiles/matcaps/mc18.jpg b/release/datafiles/matcaps/mc18.jpg
new file mode 100644 (file)
index 0000000..db57285
Binary files /dev/null and b/release/datafiles/matcaps/mc18.jpg differ
diff --git a/release/datafiles/matcaps/mc19.jpg b/release/datafiles/matcaps/mc19.jpg
new file mode 100644 (file)
index 0000000..56d2efb
Binary files /dev/null and b/release/datafiles/matcaps/mc19.jpg differ
diff --git a/release/datafiles/matcaps/mc20.jpg b/release/datafiles/matcaps/mc20.jpg
new file mode 100644 (file)
index 0000000..002a091
Binary files /dev/null and b/release/datafiles/matcaps/mc20.jpg differ
diff --git a/release/datafiles/matcaps/mc21.jpg b/release/datafiles/matcaps/mc21.jpg
new file mode 100644 (file)
index 0000000..cb2fea5
Binary files /dev/null and b/release/datafiles/matcaps/mc21.jpg differ
diff --git a/release/datafiles/matcaps/mc22.jpg b/release/datafiles/matcaps/mc22.jpg
new file mode 100644 (file)
index 0000000..2fc71b9
Binary files /dev/null and b/release/datafiles/matcaps/mc22.jpg differ
diff --git a/release/datafiles/matcaps/mc23.jpg b/release/datafiles/matcaps/mc23.jpg
new file mode 100644 (file)
index 0000000..3793c0f
Binary files /dev/null and b/release/datafiles/matcaps/mc23.jpg differ
diff --git a/release/datafiles/matcaps/mc24.jpg b/release/datafiles/matcaps/mc24.jpg
new file mode 100644 (file)
index 0000000..2a9618d
Binary files /dev/null and b/release/datafiles/matcaps/mc24.jpg differ
index ed3088696b1132b30b34f702912f52c3c8632a1b..8d108644470f1e3f00a4034c0427438d21e6380e 100644 (file)
@@ -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()
 
index fb1f9f37975b19e08ff40a51cff4b2c58ff2fbc4..c17ab386fe65b4e07cbe88866cd3c3954f0e7bb3 100644 (file)
@@ -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"),
 
        ))
 
index 19552d6038755af70d46ac6b96c75d5e2554d297..81dbb8e9aa54dbb2484901a63e1aae8e35a4c5ab 100644 (file)
@@ -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__ */
index f5ac3f19b5b77471f4fbea56da14538b98dfd38b..0560cbd69cc19c8791ad47a8e9fbf2eb7744b6c9 100644 (file)
@@ -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)
index 1a3d8d20d4794cbe31a3351747764da98e40bd31..086e9dad895fee5b2d5c76665b421d392a750759 100644 (file)
@@ -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
 
index 26a8f703545968fed08ba43e5a5bd61365fa6450..ff47d481fc82595677ec7dc563c5441639b1778c 100644 (file)
@@ -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);
        }
 
index 38112f95ec82b85d2ab2f7c795fb9f12c9be7c41..a742e6d4a1ad45f97eeea29b180a8fda2e54b9ef 100644 (file)
@@ -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}
        };