diff options
author | William Reynish <billrey@me.com> | 2019-05-18 00:22:22 +0300 |
---|---|---|
committer | William Reynish <billrey@me.com> | 2019-05-18 00:22:22 +0300 |
commit | 8af1d1b199018c11432e81156f5c65a9215113ef (patch) | |
tree | 16142bcc4505713a7a7d11003ec367bedf97da2f /source/blender/editors | |
parent | 572754f894cef9497aeab156e00e99a1a9f1fcd9 (diff) |
UI: Icons update
New icons from Andrzej Ambroż / Jendrzych:
- Bespoke icon for creating new Collections
- Special icons for Rigid Body and Rigid Body Constraints (Physics Properties)
- New icons for Holdout and Indirect Only toggles in the Outliner
- New generic Cursor icon for cases that are not related to either Orientation or Pivot
Many other tweaks to existing icons, including:
- Add & Remove Keyframe
- Weight Paint & Collision Modifier
- Tablet Pressure Sensitivity
- Playback icons
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/include/UI_icons.h | 16 | ||||
-rw-r--r-- | source/blender/editors/space_outliner/outliner_draw.c | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h index 9ee9e952856..f54e4d1c61b 100644 --- a/source/blender/editors/include/UI_icons.h +++ b/source/blender/editors/include/UI_icons.h @@ -69,7 +69,7 @@ DEF_ICON(COLLAPSEMENU) DEF_ICON(X) DEF_ICON(DUPLICATE) DEF_ICON(TRASH) -DEF_ICON_BLANK(76) +DEF_ICON(COLLECTION_NEW) DEF_ICON_BLANK(77) DEF_ICON(NODE) DEF_ICON(NODE_SEL) @@ -425,8 +425,8 @@ DEF_ICON(FORCE_DRAG) DEF_ICON(FORCE_SMOKEFLOW) DEF_ICON_BLANK(673) DEF_ICON_BLANK(674) -DEF_ICON_BLANK(675) -DEF_ICON_BLANK(676) +DEF_ICON(RIGID_BODY) +DEF_ICON(RIGID_BODY_CONSTRAINT) DEF_ICON_BLANK(677) DEF_ICON_BLANK(678) DEF_ICON_BLANK(679) @@ -488,10 +488,10 @@ DEF_ICON_BLANK(748) DEF_ICON_BLANK(749) DEF_ICON_BLANK(750) DEF_ICON_BLANK(751) -DEF_ICON_BLANK(752) -DEF_ICON_BLANK(753) -DEF_ICON_BLANK(754) -DEF_ICON_BLANK(755) +DEF_ICON(HOLDOUT_OFF) +DEF_ICON(HOLDOUT_ON) +DEF_ICON(INDIRECT_ONLY_OFF) +DEF_ICON(INDIRECT_ONLY_ON) /* EMPTY */ DEF_ICON_BLANK(501) @@ -638,7 +638,7 @@ DEF_ICON(VERTEXSEL) DEF_ICON(EDGESEL) DEF_ICON(FACESEL) DEF_ICON_BLANK(209) -DEF_ICON_BLANK(210) +DEF_ICON(CURSOR) DEF_ICON(PIVOT_BOUNDBOX) DEF_ICON(PIVOT_CURSOR) DEF_ICON(PIVOT_INDIVIDUAL) diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index fad9fa9bbee..6a7795393c9 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -1441,7 +1441,7 @@ static void outliner_draw_restrictbuts(uiBlock *block, block, UI_BTYPE_ICON_TOGGLE, 0, - (layer_collection->flag & LAYER_COLLECTION_INDIRECT_ONLY) != 0 ? 0 : ICON_REMOVE, + 0, (int)(ar->v2d.cur.xmax - restrict_offsets.indirect_only), te->ys, UI_UNIT_X, |