forked from bartvdbraak/blender
Merge ICON_SNAP_PEEL_OBJECT and corresponding icon in blenderbuttons (need new icon though)
This commit is contained in:
parent
874c29cea8
commit
141a229a79
Binary file not shown.
Before Width: | Height: | Size: 128 KiB After Width: | Height: | Size: 129 KiB |
File diff suppressed because it is too large
Load Diff
@ -498,14 +498,14 @@ typedef enum {
|
||||
ICON_SNAP_VERTEX,
|
||||
ICON_SNAP_EDGE,
|
||||
ICON_SNAP_FACE,
|
||||
ICON_BLANK218b,
|
||||
ICON_SNAP_VOLUME,
|
||||
ICON_STICKY_UVS_LOC,
|
||||
ICON_STICKY_UVS_DISABLE,
|
||||
ICON_STICKY_UVS_VERT,
|
||||
ICON_CLIPUV_DEHLT,
|
||||
ICON_CLIPUV_HLT,
|
||||
ICON_BLANK219,
|
||||
ICON_BLANK220,
|
||||
ICON_SNAP_PEEL_OBJECT,
|
||||
ICON_BLANK221,
|
||||
ICON_BLANK222,
|
||||
ICON_BLANK223,
|
||||
|
@ -5465,7 +5465,7 @@ void view3d_header_buttons(const bContext *C, ARegion *ar)
|
||||
uiDefIconButBitS(block, TOG, SCE_SNAP_ROTATE, B_REDR, ICON_SNAP_NORMAL,xco,yco,XIC,YIC, &scene->snap_flag, 0, 0, 0, 0, "Align rotation with the snapping target");
|
||||
xco+= XIC;
|
||||
if (scene->snap_mode == SCE_SNAP_MODE_VOLUME) {
|
||||
uiDefIconButBitS(block, TOG, SCE_SNAP_PEEL_OBJECT, B_REDR, 0 /* XXX 2.5 ICON_SNAP_PEEL_OBJECT */,xco,0,XIC,YIC, &scene->snap_flag, 0, 0, 0, 0, "Consider objects as whole when finding volume center");
|
||||
uiDefIconButBitS(block, TOG, SCE_SNAP_PEEL_OBJECT, B_REDR, ICON_SNAP_PEEL_OBJECT,xco,yco,XIC,YIC, &scene->snap_flag, 0, 0, 0, 0, "Consider objects as whole when finding volume center");
|
||||
xco+= XIC;
|
||||
}
|
||||
uiDefIconTextButS(block, ICONTEXTROW,B_REDR, ICON_SNAP_VERTEX, snapmode_pup(), xco,yco,XIC+10,YIC, &(scene->snap_mode), 0.0, 0.0, 0, 0, "Snapping mode");
|
||||
|
Loading…
Reference in New Issue
Block a user