diff options
author | Andrea Weikert <elubie@gmx.net> | 2011-02-27 21:03:19 +0300 |
---|---|---|
committer | Andrea Weikert <elubie@gmx.net> | 2011-02-27 21:03:19 +0300 |
commit | 4ed5cd6cef341727f230ff2d50feb460773a055d (patch) | |
tree | aeae01ad3f237785a238ed46086271d678464b03 /source/blender/editors/animation/keyingsets.c | |
parent | 7a4ca6a36dbcd48721f09801195075e2a01f1dcc (diff) |
== UI icons ==
* Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
Diffstat (limited to 'source/blender/editors/animation/keyingsets.c')
-rw-r--r-- | source/blender/editors/animation/keyingsets.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/editors/animation/keyingsets.c b/source/blender/editors/animation/keyingsets.c index d71c494705e..f77e22fddae 100644 --- a/source/blender/editors/animation/keyingsets.c +++ b/source/blender/editors/animation/keyingsets.c @@ -54,6 +54,7 @@ #include "ED_screen.h" #include "UI_interface.h" +#include "UI_resources.h" #include "WM_api.h" #include "WM_types.h" @@ -760,14 +761,14 @@ void ANIM_keying_sets_menu_setup (bContext *C, const char title[], const char op uiLayout *layout; int i = 0; - pup= uiPupMenuBegin(C, title, ICON_NULL); + pup= uiPupMenuBegin(C, title, ICON_NONE); layout= uiPupMenuLayout(pup); /* active Keying Set * - only include entry if it exists */ if (scene->active_keyingset) { - uiItemIntO(layout, "Active Keying Set", ICON_NULL, op_name, "type", i++); + uiItemIntO(layout, "Active Keying Set", ICON_NONE, op_name, "type", i++); uiItemS(layout); } else @@ -779,7 +780,7 @@ void ANIM_keying_sets_menu_setup (bContext *C, const char title[], const char op if (scene->keyingsets.first) { for (ks= scene->keyingsets.first; ks; ks= ks->next) { if (ANIM_keyingset_context_ok_poll(C, ks)) - uiItemIntO(layout, ks->name, ICON_NULL, op_name, "type", i++); + uiItemIntO(layout, ks->name, ICON_NONE, op_name, "type", i++); } uiItemS(layout); } @@ -789,7 +790,7 @@ void ANIM_keying_sets_menu_setup (bContext *C, const char title[], const char op for (ks= builtin_keyingsets.first; ks; ks= ks->next) { /* only show KeyingSet if context is suitable */ if (ANIM_keyingset_context_ok_poll(C, ks)) - uiItemIntO(layout, ks->name, ICON_NULL, op_name, "type", i--); + uiItemIntO(layout, ks->name, ICON_NONE, op_name, "type", i--); } uiPupMenuEnd(C, pup); |