diff options
| author | Jason Wilkins <Jason.A.Wilkins@gmail.com> | 2010-07-20 15:32:30 +0400 |
|---|---|---|
| committer | Jason Wilkins <Jason.A.Wilkins@gmail.com> | 2010-07-20 15:32:30 +0400 |
| commit | b618a335f5e7b5b3d291aa0cba8be232b79e9a4e (patch) | |
| tree | 1496b8f8c251636d4393de64940c72d07d3346db /source/blender/editors/interface/interface_icons.c | |
| parent | d8792465e08313d7ca11ea6f821886330f499540 (diff) | |
* Made the default sculpt icons an internal part of the executable
* Default icons can be selected from a menu
* Option to make a custom icon from a file is present but the UI is disabled because of a mysterious crash
* New startup.blend that has the appropriate icons selected
Diffstat (limited to 'source/blender/editors/interface/interface_icons.c')
| -rw-r--r-- | source/blender/editors/interface/interface_icons.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index 4e6732ee885..b0dd3aac61d 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -975,20 +975,11 @@ int ui_id_icon_get(bContext *C, ID *id, int preview) case ID_IM: /* fall through */ case ID_WO: /* fall through */ case ID_LA: /* fall through */ + case ID_BR: /* fall through */ iconid= BKE_icon_getid(id); /* checks if not exists, or changed */ ui_id_icon_render(C, id, preview); break; - case ID_BR: - { /* use the image in the brush as the icon */ - /* XXX redundancy here can be reduced be rewriting this switch as an if */ - ID* ima_id = (ID*)get_brush_icon((Brush*)id); - id = ima_id ? ima_id : id; - iconid= BKE_icon_getid(id); - /* checks if not exists, or changed */ - ui_id_icon_render(C, id, preview); - } - break; default: break; } |