diff options
| author | Miika Hamalainen <blender@miikah.org> | 2011-10-28 21:00:53 +0400 |
|---|---|---|
| committer | Miika Hamalainen <blender@miikah.org> | 2011-10-28 21:00:53 +0400 |
| commit | 46ae692710467d3622f58e0c5ce371674a6a7d9b (patch) | |
| tree | ebd27a8cc3adad65343a6a8d3d22ce02cad24db8 /source/blender/editors/datafiles | |
| parent | fae903e263fd11d788a4e55900ff25f4fc8b26db (diff) | |
| parent | 7627a742ab6e630522186b04a71fa40533d87db2 (diff) | |
Merge with trunk r41342
Diffstat (limited to 'source/blender/editors/datafiles')
| -rw-r--r-- | source/blender/editors/datafiles/Bfont.c | 1 | ||||
| -rw-r--r-- | source/blender/editors/datafiles/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | source/blender/editors/datafiles/blender_icons.png.c (renamed from source/blender/editors/datafiles/blenderbuttons.c) | 6 |
3 files changed, 4 insertions, 6 deletions
diff --git a/source/blender/editors/datafiles/Bfont.c b/source/blender/editors/datafiles/Bfont.c index 6f8adae5f3f..8a9e2748983 100644 --- a/source/blender/editors/datafiles/Bfont.c +++ b/source/blender/editors/datafiles/Bfont.c @@ -1,6 +1,5 @@ /* DataToC output of file <Bfont> */ /* - * $Id$ * * ***** BEGIN GPL LICENSE BLOCK ***** * diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt index 17e3a868a8c..946e1c66ad7 100644 --- a/source/blender/editors/datafiles/CMakeLists.txt +++ b/source/blender/editors/datafiles/CMakeLists.txt @@ -1,4 +1,3 @@ -# $Id: CMakeLists.txt 12931 2007-12-17 18:20:48Z theeth $ # ***** BEGIN GPL LICENSE BLOCK ***** # # This program is free software; you can redistribute it and/or @@ -48,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 8f1507e12e0..c4ea4601ed2 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= 200029; -char datatoc_blenderbuttons[]= { +int datatoc_blender_icons_png_size= 200029; +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, 0, 4,103, 65, 77, 65, 0, 0,177,142,124,251, 81,147, 0, 0, 0, 32, 99, 72, 82, 77, 0, 0,135, 15, 0, 0,140, 15, 0, 0,253, 82, 0, 0,129, 64, 0, 0,125,121, 0, 0,233,139, 0, 0, 60,229, 0, 0, 25,204,115, 60,133,119, |
