Renaming the extensionless "blenderbuttons" to "blender_icons.png"
authorJoshua Leung <aligorith@gmail.com>
Fri, 28 Oct 2011 00:09:13 +0000 (00:09 +0000)
committerJoshua Leung <aligorith@gmail.com>
Fri, 28 Oct 2011 00:09:13 +0000 (00:09 +0000)
release/datafiles/blender_icons.png [moved from release/datafiles/blenderbuttons with 100% similarity]
source/blender/editors/datafiles/CMakeLists.txt
source/blender/editors/datafiles/blender_icons.png.c [moved from source/blender/editors/datafiles/blenderbuttons.c with 99% similarity]
source/blender/editors/include/ED_datafiles.h
source/blender/editors/interface/interface_icons.c

index ae24456..946e1c6 100644 (file)
@@ -47,7 +47,7 @@ if(WITH_BLENDER)
 
                        # images
                        splash.png.c
-                       blenderbuttons.c
+                       blender_icons.png.c
 
                        # brushes
                        add.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,
index a31d013..2c4472c 100644 (file)
@@ -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[];
index b35e20b..089458f 100644 (file)
@@ -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 */