diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-12-10 13:23:53 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-12-10 13:23:53 +0300 |
| commit | b5740b0e779e76d599f819cf106009aea663d0bf (patch) | |
| tree | 0ea9c2cb18b586449ff4d14adf925fd0b68394f9 /source/blender/editors | |
| parent | 9c5019a9a9acd33c4757a0a1d4f0944c92e57ffd (diff) | |
remove ICON prefix from the enum, for python this is redundant eg.
layout.prop("setting", icon='ICON_BLAH_BLAH')
Also reverted previous commit, the cursor subtype just needed to be added to the switch statement.
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/include/UI_icons.h | 20 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_icons.c | 20 | ||||
| -rw-r--r-- | source/blender/editors/space_buttons/buttons_context.c | 2 |
3 files changed, 21 insertions, 21 deletions
diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h index f6de5138214..01c15a7d303 100644 --- a/source/blender/editors/include/UI_icons.h +++ b/source/blender/editors/include/UI_icons.h @@ -871,14 +871,14 @@ DEF_ICON(ICON_BLANK346b) /* vector icons */ -DEF_ICON(VICON_VIEW3D) -DEF_ICON(VICON_EDIT) -DEF_ICON(VICON_EDITMODE_DEHLT) -DEF_ICON(VICON_EDITMODE_HLT) -DEF_ICON(VICON_DISCLOSURE_TRI_RIGHT) -DEF_ICON(VICON_DISCLOSURE_TRI_DOWN) -DEF_ICON(VICON_MOVE_UP) -DEF_ICON(VICON_MOVE_DOWN) -DEF_ICON(VICON_X) -DEF_ICON(VICON_SMALL_TRI_RIGHT) +DEF_ICON(VICO_VIEW3D_VEC) +DEF_ICON(VICO_EDIT_VEC) +DEF_ICON(VICO_EDITMODE_DEHLT) +DEF_ICON(VICO_EDITMODE_HLT) +DEF_ICON(VICO_DISCLOSURE_TRI_RIGHT_VEC) +DEF_ICON(VICO_DISCLOSURE_TRI_DOWN_VEC) +DEF_ICON(VICO_MOVE_UP_VEC) +DEF_ICON(VICO_MOVE_DOWN_VEC) +DEF_ICON(VICO_X_VEC) +DEF_ICON(VICO_SMALL_TRI_RIGHT_VEC) diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index 23a0ff7d223..e219198da0f 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -528,16 +528,16 @@ static void init_internal_icons() } } - def_internal_vicon(VICON_VIEW3D, vicon_view3d_draw); - def_internal_vicon(VICON_EDIT, vicon_edit_draw); - def_internal_vicon(VICON_EDITMODE_DEHLT, vicon_editmode_dehlt_draw); - def_internal_vicon(VICON_EDITMODE_HLT, vicon_editmode_hlt_draw); - def_internal_vicon(VICON_DISCLOSURE_TRI_RIGHT, vicon_disclosure_tri_right_draw); - def_internal_vicon(VICON_DISCLOSURE_TRI_DOWN, vicon_disclosure_tri_down_draw); - def_internal_vicon(VICON_MOVE_UP, vicon_move_up_draw); - def_internal_vicon(VICON_MOVE_DOWN, vicon_move_down_draw); - def_internal_vicon(VICON_X, vicon_x_draw); - def_internal_vicon(VICON_SMALL_TRI_RIGHT, vicon_small_tri_right_draw); + def_internal_vicon(VICO_VIEW3D_VEC, vicon_view3d_draw); + def_internal_vicon(VICO_EDIT_VEC, vicon_edit_draw); + def_internal_vicon(VICO_EDITMODE_DEHLT, vicon_editmode_dehlt_draw); + def_internal_vicon(VICO_EDITMODE_HLT, vicon_editmode_hlt_draw); + def_internal_vicon(VICO_DISCLOSURE_TRI_RIGHT_VEC, vicon_disclosure_tri_right_draw); + def_internal_vicon(VICO_DISCLOSURE_TRI_DOWN_VEC, vicon_disclosure_tri_down_draw); + def_internal_vicon(VICO_MOVE_UP_VEC, vicon_move_up_draw); + def_internal_vicon(VICO_MOVE_DOWN_VEC, vicon_move_down_draw); + def_internal_vicon(VICO_X_VEC, vicon_x_draw); + def_internal_vicon(VICO_SMALL_TRI_RIGHT_VEC, vicon_small_tri_right_draw); IMB_freeImBuf(bbuf); } diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c index 0e2769a3557..ade906ce678 100644 --- a/source/blender/editors/space_buttons/buttons_context.c +++ b/source/blender/editors/space_buttons/buttons_context.c @@ -767,7 +767,7 @@ void buttons_context_draw(const bContext *C, uiLayout *layout) ptr= &path->ptr[a]; if(a != 0) - uiItemL(row, "", VICON_SMALL_TRI_RIGHT); + uiItemL(row, "", VICO_SMALL_TRI_RIGHT_VEC); if(ptr->data) { icon= RNA_struct_ui_icon(ptr->type); |