diff options
| -rw-r--r-- | release/datafiles/blender_icons.png (renamed from release/datafiles/blenderbuttons) | bin | 214916 -> 214916 bytes | |||
| -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 | ||||
| -rw-r--r-- | source/blender/editors/include/ED_datafiles.h | 4 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_icons.c | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/release/datafiles/blenderbuttons b/release/datafiles/blender_icons.png Binary files differindex a68a1f8394c..a68a1f8394c 100644 --- a/release/datafiles/blenderbuttons +++ b/release/datafiles/blender_icons.png 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, diff --git a/source/blender/editors/include/ED_datafiles.h b/source/blender/editors/include/ED_datafiles.h index a31d01358f4..2c4472c4636 100644 --- a/source/blender/editors/include/ED_datafiles.h +++ b/source/blender/editors/include/ED_datafiles.h @@ -36,8 +36,8 @@ extern int datatoc_startup_blend_size; extern char datatoc_startup_blend[]; -extern int datatoc_blenderbuttons_size; -extern char datatoc_blenderbuttons[]; +extern int datatoc_blender_icons_png_size; +extern char datatoc_blender_icons_png[]; extern int datatoc_prvicons_size; extern char datatoc_prvicons[]; diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index b35e20bfe31..089458f1da4 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -527,7 +527,7 @@ static void init_internal_icons(void) } } if(bbuf==NULL) - bbuf = IMB_ibImageFromMemory((unsigned char*)datatoc_blenderbuttons, datatoc_blenderbuttons_size, IB_rect, "<blender icons>"); + bbuf = IMB_ibImageFromMemory((unsigned char*)datatoc_blender_icons_png, datatoc_blender_icons_png_size, IB_rect, "<blender icons>"); if(bbuf) { /* free existing texture if any */ |
