diff options
| author | Ton Roosendaal <ton@blender.org> | 2012-12-18 23:35:54 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2012-12-18 23:35:54 +0400 |
| commit | 8168fba97213d985669a6cc37c477590a6b45d01 (patch) | |
| tree | a4ffba3779ba71641d2e18880db4b48475b92baa /source/blender/editors/datafiles | |
| parent | edf826d9240a1e153329e133f98d6a7243aa0c48 (diff) | |
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)
Diffstat (limited to 'source/blender/editors/datafiles')
| -rw-r--r-- | source/blender/editors/datafiles/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | source/blender/editors/datafiles/SConscript | 3 |
2 files changed, 4 insertions, 2 deletions
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"), |