[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54336] trunk/blender: New matcap collection for default in release.
Ton Roosendaal
ton at blender.org
Tue Feb 5 17:16:07 CET 2013
Revision: 54336
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54336
Author: ton
Date: 2013-02-05 16:16:07 +0000 (Tue, 05 Feb 2013)
Log Message:
-----------
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.
Modified Paths:
--------------
trunk/blender/SConstruct
trunk/blender/release/datafiles/matcaps/license.txt
trunk/blender/release/datafiles/matcaps/mc01.jpg
trunk/blender/release/datafiles/matcaps/mc02.jpg
trunk/blender/release/datafiles/matcaps/mc03.jpg
trunk/blender/release/datafiles/matcaps/mc04.jpg
trunk/blender/release/datafiles/matcaps/mc05.jpg
trunk/blender/release/datafiles/matcaps/mc06.jpg
trunk/blender/release/datafiles/matcaps/mc07.jpg
trunk/blender/release/datafiles/matcaps/mc08.jpg
trunk/blender/release/datafiles/matcaps/mc09.jpg
trunk/blender/release/datafiles/matcaps/mc10.jpg
trunk/blender/release/datafiles/matcaps/mc11.jpg
trunk/blender/release/datafiles/matcaps/mc12.jpg
trunk/blender/release/datafiles/matcaps/mc13.jpg
trunk/blender/release/datafiles/matcaps/mc14.jpg
trunk/blender/release/datafiles/matcaps/mc15.jpg
trunk/blender/release/datafiles/matcaps/mc16.jpg
trunk/blender/source/blender/editors/datafiles/CMakeLists.txt
trunk/blender/source/blender/editors/datafiles/SConscript
trunk/blender/source/blender/editors/include/ED_datafiles.h
trunk/blender/source/blender/editors/include/UI_icons.h
trunk/blender/source/blender/editors/interface/interface_icons.c
trunk/blender/source/blender/editors/interface/interface_templates.c
trunk/blender/source/blender/makesrna/intern/rna_space.c
Added Paths:
-----------
trunk/blender/release/datafiles/matcaps/mc17.jpg
trunk/blender/release/datafiles/matcaps/mc18.jpg
trunk/blender/release/datafiles/matcaps/mc19.jpg
trunk/blender/release/datafiles/matcaps/mc20.jpg
trunk/blender/release/datafiles/matcaps/mc21.jpg
trunk/blender/release/datafiles/matcaps/mc22.jpg
trunk/blender/release/datafiles/matcaps/mc23.jpg
trunk/blender/release/datafiles/matcaps/mc24.jpg
Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct 2013-02-05 15:58:15 UTC (rev 54335)
+++ trunk/blender/SConstruct 2013-02-05 16:16:07 UTC (rev 54336)
@@ -591,6 +591,14 @@
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 ##########
Modified: trunk/blender/release/datafiles/matcaps/license.txt
===================================================================
--- trunk/blender/release/datafiles/matcaps/license.txt 2013-02-05 15:58:15 UTC (rev 54335)
+++ trunk/blender/release/datafiles/matcaps/license.txt 2013-02-05 16:16:07 UTC (rev 54336)
@@ -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.
Modified: trunk/blender/release/datafiles/matcaps/mc01.jpg
===================================================================
(Binary files differ)
Modified: trunk/blender/release/datafiles/matcaps/mc02.jpg
===================================================================
(Binary files differ)
Modified: trunk/blender/release/datafiles/matcaps/mc03.jpg
===================================================================
(Binary files differ)
Modified: trunk/blender/release/datafiles/matcaps/mc04.jpg
===================================================================
(Binary files differ)
Modified: trunk/blender/release/datafiles/matcaps/mc05.jpg
===================================================================
(Binary files differ)
Modified: trunk/blender/release/datafiles/matcaps/mc06.jpg
===================================================================
(Binary files differ)
Modified: trunk/blender/release/datafiles/matcaps/mc07.jpg
===================================================================
(Binary files differ)
Modified: trunk/blender/release/datafiles/matcaps/mc08.jpg
===================================================================
(Binary files differ)
Modified: trunk/blender/release/datafiles/matcaps/mc09.jpg
===================================================================
(Binary files differ)
Modified: trunk/blender/release/datafiles/matcaps/mc10.jpg
===================================================================
(Binary files differ)
Modified: trunk/blender/release/datafiles/matcaps/mc11.jpg
===================================================================
(Binary files differ)
Modified: trunk/blender/release/datafiles/matcaps/mc12.jpg
===================================================================
(Binary files differ)
Modified: trunk/blender/release/datafiles/matcaps/mc13.jpg
===================================================================
(Binary files differ)
Modified: trunk/blender/release/datafiles/matcaps/mc14.jpg
===================================================================
(Binary files differ)
Modified: trunk/blender/release/datafiles/matcaps/mc15.jpg
===================================================================
(Binary files differ)
Modified: trunk/blender/release/datafiles/matcaps/mc16.jpg
===================================================================
(Binary files differ)
Added: trunk/blender/release/datafiles/matcaps/mc17.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/blender/release/datafiles/matcaps/mc17.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/blender/release/datafiles/matcaps/mc18.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/blender/release/datafiles/matcaps/mc18.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/blender/release/datafiles/matcaps/mc19.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/blender/release/datafiles/matcaps/mc19.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/blender/release/datafiles/matcaps/mc20.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/blender/release/datafiles/matcaps/mc20.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/blender/release/datafiles/matcaps/mc21.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/blender/release/datafiles/matcaps/mc21.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/blender/release/datafiles/matcaps/mc22.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/blender/release/datafiles/matcaps/mc22.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/blender/release/datafiles/matcaps/mc23.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/blender/release/datafiles/matcaps/mc23.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/blender/release/datafiles/matcaps/mc24.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/blender/release/datafiles/matcaps/mc24.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/blender/source/blender/editors/datafiles/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/datafiles/CMakeLists.txt 2013-02-05 15:58:15 UTC (rev 54335)
+++ trunk/blender/source/blender/editors/datafiles/CMakeLists.txt 2013-02-05 16:16:07 UTC (rev 54336)
@@ -100,6 +100,14 @@
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()
Modified: trunk/blender/source/blender/editors/datafiles/SConscript
===================================================================
--- trunk/blender/source/blender/editors/datafiles/SConscript 2013-02-05 15:58:15 UTC (rev 54335)
+++ trunk/blender/source/blender/editors/datafiles/SConscript 2013-02-05 16:16:07 UTC (rev 54336)
@@ -95,6 +95,14 @@
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"),
))
Modified: trunk/blender/source/blender/editors/include/ED_datafiles.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_datafiles.h 2013-02-05 15:58:15 UTC (rev 54335)
+++ trunk/blender/source/blender/editors/include/ED_datafiles.h 2013-02-05 16:16:07 UTC (rev 54336)
@@ -206,7 +206,31 @@
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__ */
Modified: trunk/blender/source/blender/editors/include/UI_icons.h
===================================================================
--- trunk/blender/source/blender/editors/include/UI_icons.h 2013-02-05 15:58:15 UTC (rev 54335)
+++ trunk/blender/source/blender/editors/include/UI_icons.h 2013-02-05 16:16:07 UTC (rev 54336)
@@ -1007,6 +1007,14 @@
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)
Modified: trunk/blender/source/blender/editors/interface/interface_icons.c
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list