From 8168fba97213d985669a6cc37c477590a6b45d01 Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Tue, 18 Dec 2012 19:35:54 +0000 Subject: Icons now draw good again! - Exported via Inkscape a 16 and 32 pixel bitmap version - Use these as mipmap levels for OpenGL texture drawing. - Changed code to get right sizes for drawing icons - better than last week's method. Todo: - Custom icons don't work yet (old one) - Missing icons in the svg - The .sh script for inkscape needs changed to support this (now do manual saving) --- source/blender/editors/datafiles/CMakeLists.txt | 3 ++- source/blender/editors/datafiles/SConscript | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'source/blender/editors/datafiles') diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt index ec20e2d3d09..6d6b7ecdd82 100644 --- a/source/blender/editors/datafiles/CMakeLists.txt +++ b/source/blender/editors/datafiles/CMakeLists.txt @@ -46,7 +46,8 @@ if(WITH_BLENDER) # images data_to_c_simple(../../../../release/datafiles/splash.png SRC) - data_to_c_simple(../../../../release/datafiles/blender_icons.png SRC) + data_to_c_simple(../../../../release/datafiles/blender_icons16.png SRC) + data_to_c_simple(../../../../release/datafiles/blender_icons32.png SRC) data_to_c_simple(../../../../release/datafiles/prvicons.png SRC) # brushes diff --git a/source/blender/editors/datafiles/SConscript b/source/blender/editors/datafiles/SConscript index fcc610eeee1..cb6fe11dbb2 100644 --- a/source/blender/editors/datafiles/SConscript +++ b/source/blender/editors/datafiles/SConscript @@ -40,7 +40,8 @@ sources.extend(( os.path.join(env['DATA_SOURCES'], "bmonofont.ttf.c"), os.path.join(env['DATA_SOURCES'], "splash.png.c"), - os.path.join(env['DATA_SOURCES'], "blender_icons.png.c"), + os.path.join(env['DATA_SOURCES'], "blender_icons16.png.c"), + os.path.join(env['DATA_SOURCES'], "blender_icons32.png.c"), os.path.join(env['DATA_SOURCES'], "prvicons.png.c"), os.path.join(env['DATA_SOURCES'], "startup.blend.c"), -- cgit v1.2.3