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/object/object_constraint.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/object/object_constraint.c')
-rw-r--r-- | source/blender/editors/object/object_constraint.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/source/blender/editors/object/object_constraint.c b/source/blender/editors/object/object_constraint.c index 62529f6adca..863cfbb6a94 100644 --- a/source/blender/editors/object/object_constraint.c +++ b/source/blender/editors/object/object_constraint.c @@ -70,6 +70,7 @@ #include "ED_screen.h" #include "UI_interface.h" +#include "UI_resources.h" #include "object_intern.h" @@ -1531,7 +1532,7 @@ static int pose_ik_add_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(evt)) } /* prepare popup menu to choose targetting options */ - pup= uiPupMenuBegin(C, "Add IK", ICON_NULL); + pup= uiPupMenuBegin(C, "Add IK", ICON_NONE); layout= uiPupMenuLayout(pup); /* the type of targets we'll set determines the menu entries to show... */ @@ -1540,14 +1541,14 @@ static int pose_ik_add_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(evt)) * - the only thing that matters is that we want a target... */ if (tar_pchan) - uiItemBooleanO(layout, "To Active Bone", ICON_NULL, "POSE_OT_ik_add", "with_targets", 1); + uiItemBooleanO(layout, "To Active Bone", ICON_NONE, "POSE_OT_ik_add", "with_targets", 1); else - uiItemBooleanO(layout, "To Active Object", ICON_NULL, "POSE_OT_ik_add", "with_targets", 1); + uiItemBooleanO(layout, "To Active Object", ICON_NONE, "POSE_OT_ik_add", "with_targets", 1); } else { /* we have a choice of adding to a new empty, or not setting any target (targetless IK) */ - uiItemBooleanO(layout, "To New Empty Object", ICON_NULL, "POSE_OT_ik_add", "with_targets", 1); - uiItemBooleanO(layout, "Without Targets", ICON_NULL, "POSE_OT_ik_add", "with_targets", 0); + uiItemBooleanO(layout, "To New Empty Object", ICON_NONE, "POSE_OT_ik_add", "with_targets", 1); + uiItemBooleanO(layout, "Without Targets", ICON_NONE, "POSE_OT_ik_add", "with_targets", 0); } /* finish building the menu, and process it (should result in calling self again) */ |