diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-01-27 03:49:13 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-01-27 03:49:13 +0400 |
| commit | 556912792ad3c37c294256a558c96b39f264e7b5 (patch) | |
| tree | 9b6ee8cf1ad92ee89c04f27a89be11599c5b40c0 /SConstruct | |
| parent | 9251d628db0abe599d927d79170025d8545c8ace (diff) | |
| parent | c84383301c5a2582e95259a7e4468a23a3566401 (diff) | |
Merged changes in the trunk up to revision 54110.
Conflicts resolved:
source/blender/blenfont/SConscript
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/rna_scene.c
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/SConstruct b/SConstruct index 171ebc8ddef..e3e58270cdd 100644 --- a/SConstruct +++ b/SConstruct @@ -575,6 +575,23 @@ data_to_c_simple("release/datafiles/brushicons/thumb.png") data_to_c_simple("release/datafiles/brushicons/twist.png") data_to_c_simple("release/datafiles/brushicons/vertexdraw.png") +data_to_c_simple("release/datafiles/matcaps/mc01.jpg") +data_to_c_simple("release/datafiles/matcaps/mc02.jpg") +data_to_c_simple("release/datafiles/matcaps/mc03.jpg") +data_to_c_simple("release/datafiles/matcaps/mc04.jpg") +data_to_c_simple("release/datafiles/matcaps/mc05.jpg") +data_to_c_simple("release/datafiles/matcaps/mc06.jpg") +data_to_c_simple("release/datafiles/matcaps/mc07.jpg") +data_to_c_simple("release/datafiles/matcaps/mc08.jpg") +data_to_c_simple("release/datafiles/matcaps/mc09.jpg") +data_to_c_simple("release/datafiles/matcaps/mc10.jpg") +data_to_c_simple("release/datafiles/matcaps/mc11.jpg") +data_to_c_simple("release/datafiles/matcaps/mc12.jpg") +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") + ##### END DATAFILES ########## Help(opts.GenerateHelpText(env)) |