diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-10-28 09:17:09 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-10-28 09:17:09 +0400 |
| commit | ff837cbe9b2a27678a6111207ce60b64f44d5917 (patch) | |
| tree | de1f188ed4d2b0659a8ebecb3a1e8b4792483065 /source/blender/editors/datafiles | |
| parent | c914b11614fff23bca5b601da24f02ab51b9db52 (diff) | |
| parent | 4b635d16316d12dd4c57e1dcf99092551e6bbe35 (diff) | |
svn merge -r41310:41329 ^/trunk/blender
Diffstat (limited to 'source/blender/editors/datafiles')
| -rw-r--r-- | source/blender/editors/datafiles/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/blender/editors/datafiles/blender_icons.png.c (renamed from source/blender/editors/datafiles/blenderbuttons.c) | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt index ae24456383b..946e1c66ad7 100644 --- a/source/blender/editors/datafiles/CMakeLists.txt +++ b/source/blender/editors/datafiles/CMakeLists.txt @@ -47,7 +47,7 @@ if(WITH_BLENDER) # images splash.png.c - blenderbuttons.c + blender_icons.png.c # brushes add.png.c diff --git a/source/blender/editors/datafiles/blenderbuttons.c b/source/blender/editors/datafiles/blender_icons.png.c index 243e9838e9e..a53e2813d2e 100644 --- a/source/blender/editors/datafiles/blenderbuttons.c +++ b/source/blender/editors/datafiles/blender_icons.png.c @@ -1,7 +1,7 @@ -/* DataToC output of file <blenderbuttons> */ +/* DataToC output of file <blender_icons_png> */ -int datatoc_blenderbuttons_size= 214916; -char datatoc_blenderbuttons[]= { +int datatoc_blender_icons_png_size= 214916; +char datatoc_blender_icons_png[]= { 137, 80, 78, 71, 13, 10, 26, 10, 0, 0, 0, 13, 73, 72, 68, 82, 0, 0, 2, 90, 0, 0, 2,128, 8, 6, 0, 0, 0, 68,254,214,163, 0, 0, 10, 79,105, 67, 67, 80, 80,104,111,116,111,115,104,111,112, 32, 73, 67, 67, 32,112,114,111,102,105,108,101, 0, 0,120,218,157, 83, |
