diff options
Diffstat (limited to 'source/blender/editors/space_view3d')
4 files changed, 55 insertions, 55 deletions
diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c index 0e4e1ad7266..89081513962 100644 --- a/source/blender/editors/space_view3d/view3d_buttons.c +++ b/source/blender/editors/space_view3d/view3d_buttons.c @@ -779,57 +779,57 @@ static void v3d_transform_butsR(uiLayout *layout, PointerRNA *ptr) uiLayoutSetActive(split, !(bone->parent && bone->flag & BONE_CONNECTED)); } colsub = uiLayoutColumn(split, 1); - uiItemR(colsub, ptr, "location", 0, "Location", ICON_NULL); + uiItemR(colsub, ptr, "location", 0, "Location", ICON_NONE); colsub = uiLayoutColumn(split, 1); - uiItemL(colsub, "", ICON_NULL); - uiItemR(colsub, ptr, "lock_location", UI_ITEM_R_TOGGLE+UI_ITEM_R_ICON_ONLY, "", ICON_NULL); + uiItemL(colsub, "", ICON_NONE); + uiItemR(colsub, ptr, "lock_location", UI_ITEM_R_TOGGLE+UI_ITEM_R_ICON_ONLY, "", ICON_NONE); split = uiLayoutSplit(layout, 0.8, 0); switch(RNA_enum_get(ptr, "rotation_mode")) { case ROT_MODE_QUAT: /* quaternion */ colsub = uiLayoutColumn(split, 1); - uiItemR(colsub, ptr, "rotation_quaternion", 0, "Rotation", ICON_NULL); + uiItemR(colsub, ptr, "rotation_quaternion", 0, "Rotation", ICON_NONE); colsub = uiLayoutColumn(split, 1); - uiItemR(colsub, ptr, "lock_rotations_4d", UI_ITEM_R_TOGGLE, "4L", ICON_NULL); + uiItemR(colsub, ptr, "lock_rotations_4d", UI_ITEM_R_TOGGLE, "4L", ICON_NONE); if (RNA_boolean_get(ptr, "lock_rotations_4d")) - uiItemR(colsub, ptr, "lock_rotation_w", UI_ITEM_R_TOGGLE+UI_ITEM_R_ICON_ONLY, "", ICON_NULL); + uiItemR(colsub, ptr, "lock_rotation_w", UI_ITEM_R_TOGGLE+UI_ITEM_R_ICON_ONLY, "", ICON_NONE); else - uiItemL(colsub, "", ICON_NULL); - uiItemR(colsub, ptr, "lock_rotation", UI_ITEM_R_TOGGLE+UI_ITEM_R_ICON_ONLY, "", ICON_NULL); + uiItemL(colsub, "", ICON_NONE); + uiItemR(colsub, ptr, "lock_rotation", UI_ITEM_R_TOGGLE+UI_ITEM_R_ICON_ONLY, "", ICON_NONE); break; case ROT_MODE_AXISANGLE: /* axis angle */ colsub = uiLayoutColumn(split, 1); - uiItemR(colsub, ptr, "rotation_axis_angle", 0, "Rotation", ICON_NULL); + uiItemR(colsub, ptr, "rotation_axis_angle", 0, "Rotation", ICON_NONE); colsub = uiLayoutColumn(split, 1); - uiItemR(colsub, ptr, "lock_rotations_4d", UI_ITEM_R_TOGGLE, "4L", ICON_NULL); + uiItemR(colsub, ptr, "lock_rotations_4d", UI_ITEM_R_TOGGLE, "4L", ICON_NONE); if (RNA_boolean_get(ptr, "lock_rotations_4d")) - uiItemR(colsub, ptr, "lock_rotation_w", UI_ITEM_R_TOGGLE+UI_ITEM_R_ICON_ONLY, "", ICON_NULL); + uiItemR(colsub, ptr, "lock_rotation_w", UI_ITEM_R_TOGGLE+UI_ITEM_R_ICON_ONLY, "", ICON_NONE); else - uiItemL(colsub, "", ICON_NULL); - uiItemR(colsub, ptr, "lock_rotation", UI_ITEM_R_TOGGLE+UI_ITEM_R_ICON_ONLY, "", ICON_NULL); + uiItemL(colsub, "", ICON_NONE); + uiItemR(colsub, ptr, "lock_rotation", UI_ITEM_R_TOGGLE+UI_ITEM_R_ICON_ONLY, "", ICON_NONE); break; default: /* euler rotations */ colsub = uiLayoutColumn(split, 1); - uiItemR(colsub, ptr, "rotation_euler", 0, "Rotation", ICON_NULL); + uiItemR(colsub, ptr, "rotation_euler", 0, "Rotation", ICON_NONE); colsub = uiLayoutColumn(split, 1); - uiItemL(colsub, "", ICON_NULL); - uiItemR(colsub, ptr, "lock_rotation", UI_ITEM_R_TOGGLE+UI_ITEM_R_ICON_ONLY, "", ICON_NULL); + uiItemL(colsub, "", ICON_NONE); + uiItemR(colsub, ptr, "lock_rotation", UI_ITEM_R_TOGGLE+UI_ITEM_R_ICON_ONLY, "", ICON_NONE); break; } - uiItemR(layout, ptr, "rotation_mode", 0, "", ICON_NULL); + uiItemR(layout, ptr, "rotation_mode", 0, "", ICON_NONE); split = uiLayoutSplit(layout, 0.8, 0); colsub = uiLayoutColumn(split, 1); - uiItemR(colsub, ptr, "scale", 0, "Scale", ICON_NULL); + uiItemR(colsub, ptr, "scale", 0, "Scale", ICON_NONE); colsub = uiLayoutColumn(split, 1); - uiItemL(colsub, "", ICON_NULL); - uiItemR(colsub, ptr, "lock_scale", UI_ITEM_R_TOGGLE+UI_ITEM_R_ICON_ONLY, "", ICON_NULL); + uiItemL(colsub, "", ICON_NONE); + uiItemR(colsub, ptr, "lock_scale", UI_ITEM_R_TOGGLE+UI_ITEM_R_ICON_ONLY, "", ICON_NONE); if (ptr->type == &RNA_Object) { Object *ob = ptr->data; if (ELEM5(ob->type, OB_MESH, OB_CURVE, OB_SURF, OB_FONT, OB_MBALL)) - uiItemR(layout, ptr, "dimensions", 0, "Dimensions", ICON_NULL); + uiItemR(layout, ptr, "dimensions", 0, "Dimensions", ICON_NONE); } } @@ -849,7 +849,7 @@ static void v3d_posearmature_buts(uiLayout *layout, Object *ob) // row= uiLayoutRow(layout, 0); if (!pchan) { - uiItemL(layout, "No Bone Active", ICON_NULL); + uiItemL(layout, "No Bone Active", ICON_NONE); return; } @@ -962,18 +962,18 @@ static void v3d_editarmature_buts(uiLayout *layout, Object *ob) col= uiLayoutColumn(layout, 0); - uiItemR(col, &eboneptr, "head", 0, "Head", ICON_NULL); + uiItemR(col, &eboneptr, "head", 0, "Head", ICON_NONE); if (ebone->parent && ebone->flag & BONE_CONNECTED ) { PointerRNA parptr = RNA_pointer_get(&eboneptr, "parent"); - uiItemR(col, &parptr, "tail_radius", 0, "Radius (Parent)", ICON_NULL); + uiItemR(col, &parptr, "tail_radius", 0, "Radius (Parent)", ICON_NONE); } else { - uiItemR(col, &eboneptr, "head_radius", 0, "Radius", ICON_NULL); + uiItemR(col, &eboneptr, "head_radius", 0, "Radius", ICON_NONE); } - uiItemR(col, &eboneptr, "tail", 0, "Tail", ICON_NULL); - uiItemR(col, &eboneptr, "tail_radius", 0, "Radius", ICON_NULL); + uiItemR(col, &eboneptr, "tail", 0, "Tail", ICON_NONE); + uiItemR(col, &eboneptr, "tail_radius", 0, "Radius", ICON_NONE); - uiItemR(col, &eboneptr, "roll", 0, "Roll", ICON_NULL); + uiItemR(col, &eboneptr, "roll", 0, "Roll", ICON_NONE); } static void v3d_editmetaball_buts(uiLayout *layout, Object *ob) @@ -992,37 +992,37 @@ static void v3d_editmetaball_buts(uiLayout *layout, Object *ob) RNA_pointer_create(&mball->id, &RNA_MetaElement, mball->lastelem, &ptr); col= uiLayoutColumn(layout, 0); - uiItemR(col, &ptr, "co", 0, "Location", ICON_NULL); + uiItemR(col, &ptr, "co", 0, "Location", ICON_NONE); - uiItemR(col, &ptr, "radius", 0, "Radius", ICON_NULL); - uiItemR(col, &ptr, "stiffness", 0, "Stiffness", ICON_NULL); + uiItemR(col, &ptr, "radius", 0, "Radius", ICON_NONE); + uiItemR(col, &ptr, "stiffness", 0, "Stiffness", ICON_NONE); - uiItemR(col, &ptr, "type", 0, "Type", ICON_NULL); + uiItemR(col, &ptr, "type", 0, "Type", ICON_NONE); col= uiLayoutColumn(layout, 1); switch (RNA_enum_get(&ptr, "type")) { case MB_BALL: break; case MB_CUBE: - uiItemL(col, "Size:", ICON_NULL); - uiItemR(col, &ptr, "size_x", 0, "X", ICON_NULL); - uiItemR(col, &ptr, "size_y", 0, "Y", ICON_NULL); - uiItemR(col, &ptr, "size_z", 0, "Z", ICON_NULL); + uiItemL(col, "Size:", ICON_NONE); + uiItemR(col, &ptr, "size_x", 0, "X", ICON_NONE); + uiItemR(col, &ptr, "size_y", 0, "Y", ICON_NONE); + uiItemR(col, &ptr, "size_z", 0, "Z", ICON_NONE); break; case MB_TUBE: - uiItemL(col, "Size:", ICON_NULL); - uiItemR(col, &ptr, "size_x", 0, "X", ICON_NULL); + uiItemL(col, "Size:", ICON_NONE); + uiItemR(col, &ptr, "size_x", 0, "X", ICON_NONE); break; case MB_PLANE: - uiItemL(col, "Size:", ICON_NULL); - uiItemR(col, &ptr, "size_x", 0, "X", ICON_NULL); - uiItemR(col, &ptr, "size_y", 0, "Y", ICON_NULL); + uiItemL(col, "Size:", ICON_NONE); + uiItemR(col, &ptr, "size_x", 0, "X", ICON_NONE); + uiItemR(col, &ptr, "size_y", 0, "Y", ICON_NONE); break; case MB_ELIPSOID: - uiItemL(col, "Size:", ICON_NULL); - uiItemR(col, &ptr, "size_x", 0, "X", ICON_NULL); - uiItemR(col, &ptr, "size_y", 0, "Y", ICON_NULL); - uiItemR(col, &ptr, "size_z", 0, "Z", ICON_NULL); + uiItemL(col, "Size:", ICON_NONE); + uiItemR(col, &ptr, "size_x", 0, "X", ICON_NONE); + uiItemR(col, &ptr, "size_y", 0, "Y", ICON_NONE); + uiItemR(col, &ptr, "size_z", 0, "Z", ICON_NONE); break; } } diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c index 82605439b33..dd9de6ae4ef 100644 --- a/source/blender/editors/space_view3d/view3d_header.c +++ b/source/blender/editors/space_view3d/view3d_header.c @@ -455,7 +455,7 @@ void uiTemplateHeader3D(uiLayout *layout, struct bContext *C) uiBlockEndAlign(block); /* Draw type */ - uiItemR(layout, &v3dptr, "viewport_shade", UI_ITEM_R_ICON_ONLY, "", ICON_NULL); + uiItemR(layout, &v3dptr, "viewport_shade", UI_ITEM_R_ICON_ONLY, "", ICON_NONE); if (obedit==NULL && ((ob && ob->mode & (OB_MODE_VERTEX_PAINT|OB_MODE_WEIGHT_PAINT|OB_MODE_TEXTURE_PAINT)))) { /* Manipulators aren't used in weight paint mode */ @@ -463,13 +463,13 @@ void uiTemplateHeader3D(uiLayout *layout, struct bContext *C) PointerRNA meshptr; RNA_pointer_create(&ob->id, &RNA_Mesh, ob->data, &meshptr); - uiItemR(layout, &meshptr, "use_paint_mask", UI_ITEM_R_ICON_ONLY, "", ICON_NULL); + uiItemR(layout, &meshptr, "use_paint_mask", UI_ITEM_R_ICON_ONLY, "", ICON_NONE); } else { const char *str_menu; row= uiLayoutRow(layout, 1); - uiItemR(row, &v3dptr, "pivot_point", UI_ITEM_R_ICON_ONLY, "", ICON_NULL); - uiItemR(row, &v3dptr, "use_pivot_point_align", UI_ITEM_R_ICON_ONLY, "", ICON_NULL); + uiItemR(row, &v3dptr, "pivot_point", UI_ITEM_R_ICON_ONLY, "", ICON_NONE); + uiItemR(row, &v3dptr, "use_pivot_point_align", UI_ITEM_R_ICON_ONLY, "", ICON_NONE); /* NDOF */ /* Not implemented yet @@ -484,7 +484,7 @@ void uiTemplateHeader3D(uiLayout *layout, struct bContext *C) /* Transform widget / manipulators */ row= uiLayoutRow(layout, 1); - uiItemR(row, &v3dptr, "show_manipulator", UI_ITEM_R_ICON_ONLY, "", ICON_NULL); + uiItemR(row, &v3dptr, "show_manipulator", UI_ITEM_R_ICON_ONLY, "", ICON_NONE); block= uiLayoutGetBlock(row); if(v3d->twflag & V3D_USE_MANIPULATOR) { @@ -512,7 +512,7 @@ void uiTemplateHeader3D(uiLayout *layout, struct bContext *C) uiTemplateLayers(layout, &v3dptr, "layers", &v3dptr, "layers_used", ob_lay); /* Scene lock */ - uiItemR(layout, &v3dptr, "lock_camera_and_layers", UI_ITEM_R_ICON_ONLY, "", ICON_NULL); + uiItemR(layout, &v3dptr, "lock_camera_and_layers", UI_ITEM_R_ICON_ONLY, "", ICON_NONE); } /* selection modus, dont use python for this since it cant do the toggle buttons with shift+click as well as clicking to set one. */ diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index 4aa64733875..0f8cf5edb25 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -72,7 +72,7 @@ #include "ED_mball.h" #include "UI_interface.h" - +#include "UI_resources.h" #include "view3d_intern.h" // own include @@ -1007,7 +1007,7 @@ static Base *mouse_select_menu(bContext *C, ViewContext *vc, unsigned int *buffe } else { /* UI */ - uiPopupMenu *pup= uiPupMenuBegin(C, "Select Object", ICON_NULL); + uiPopupMenu *pup= uiPupMenuBegin(C, "Select Object", ICON_NONE); uiLayout *layout= uiPupMenuLayout(pup); uiLayout *split= uiLayoutSplit(layout, 0, 0); uiLayout *column= uiLayoutColumn(split, 0); diff --git a/source/blender/editors/space_view3d/view3d_toolbar.c b/source/blender/editors/space_view3d/view3d_toolbar.c index bfe324df51e..6fc68f19bd5 100644 --- a/source/blender/editors/space_view3d/view3d_toolbar.c +++ b/source/blender/editors/space_view3d/view3d_toolbar.c @@ -94,7 +94,7 @@ static void view3d_panel_operator_redo_operator(const bContext *C, Panel *pa, wm { if(op->type->flag & OPTYPE_MACRO) { for(op= op->macro.first; op; op= op->next) { - uiItemL(pa->layout, op->type->name, ICON_NULL); + uiItemL(pa->layout, op->type->name, ICON_NONE); view3d_panel_operator_redo_operator(C, pa, op); } } @@ -215,7 +215,7 @@ static void view3d_panel_tool_shelf(const bContext *C, Panel *pa) for(ct= st->toolshelf.first; ct; ct= ct->next) { if(0==strncmp(context, ct->context, OP_MAX_TYPENAME)) { col= uiLayoutColumn(pa->layout, 1); - uiItemFullO(col, ct->opname, NULL, ICON_NULL, NULL, WM_OP_INVOKE_REGION_WIN, 0); + uiItemFullO(col, ct->opname, NULL, ICON_NONE, NULL, WM_OP_INVOKE_REGION_WIN, 0); } } } |