diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-06-22 08:04:46 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-06-22 08:04:46 +0300 |
commit | 4774657370e005b3c2b7e4c76885e5ca55a63ccd (patch) | |
tree | 72a5fa149b91e1619353cae452d4e6f878db7ed1 | |
parent | 2642ba13b4639fc524bc77e30c112942cd3f5355 (diff) |
UI: remove Visible IPO icons
These are duplicates of HIDE_ON/OFF.
-rw-r--r-- | release/datafiles/blender_icons16/icon16_visible_ipo_off.dat | bin | 1048 -> 0 bytes | |||
-rw-r--r-- | release/datafiles/blender_icons16/icon16_visible_ipo_on.dat | bin | 1048 -> 0 bytes | |||
-rw-r--r-- | release/datafiles/blender_icons32/icon32_visible_ipo_off.dat | bin | 4120 -> 0 bytes | |||
-rw-r--r-- | release/datafiles/blender_icons32/icon32_visible_ipo_on.dat | bin | 4120 -> 0 bytes | |||
-rw-r--r-- | release/scripts/startup/bl_ui/space_clip.py | 4 | ||||
-rw-r--r-- | source/blender/editors/animation/anim_channels_defines.c | 4 | ||||
-rw-r--r-- | source/blender/editors/datafiles/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/editors/include/UI_icons.h | 4 |
8 files changed, 6 insertions, 8 deletions
diff --git a/release/datafiles/blender_icons16/icon16_visible_ipo_off.dat b/release/datafiles/blender_icons16/icon16_visible_ipo_off.dat Binary files differdeleted file mode 100644 index 4cb9c54a1ce..00000000000 --- a/release/datafiles/blender_icons16/icon16_visible_ipo_off.dat +++ /dev/null diff --git a/release/datafiles/blender_icons16/icon16_visible_ipo_on.dat b/release/datafiles/blender_icons16/icon16_visible_ipo_on.dat Binary files differdeleted file mode 100644 index 70073f4ef99..00000000000 --- a/release/datafiles/blender_icons16/icon16_visible_ipo_on.dat +++ /dev/null diff --git a/release/datafiles/blender_icons32/icon32_visible_ipo_off.dat b/release/datafiles/blender_icons32/icon32_visible_ipo_off.dat Binary files differdeleted file mode 100644 index a15bcefd2d3..00000000000 --- a/release/datafiles/blender_icons32/icon32_visible_ipo_off.dat +++ /dev/null diff --git a/release/datafiles/blender_icons32/icon32_visible_ipo_on.dat b/release/datafiles/blender_icons32/icon32_visible_ipo_on.dat Binary files differdeleted file mode 100644 index 6fb4fd6975a..00000000000 --- a/release/datafiles/blender_icons32/icon32_visible_ipo_on.dat +++ /dev/null diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py index f653f8f738f..63db987a620 100644 --- a/release/scripts/startup/bl_ui/space_clip.py +++ b/release/scripts/startup/bl_ui/space_clip.py @@ -106,7 +106,7 @@ class CLIP_PT_clip_display(Panel): row.separator() row.prop(sc, "use_grayscale_preview", text="B/W", toggle=True) row.separator() - row.prop(sc, "use_mute_footage", text="", icon='VISIBLE_IPO_ON', toggle=True) + row.prop(sc, "use_mute_footage", text="", icon='HIDE_OFF', toggle=True) layout.separator() @@ -1633,7 +1633,7 @@ class CLIP_MT_tracking_pie(Menu): prop.backwards = False prop.sequence = True # Disable Marker - pie.operator("clip.disable_markers", icon='VISIBLE_IPO_ON').action = 'TOGGLE' + pie.operator("clip.disable_markers", icon='HIDE_OFF').action = 'TOGGLE' # Detect Features pie.operator("clip.detect_features", icon='ZOOM_SELECTED') # Clear Path Backwards diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c index 00025112835..7a7769ccc90 100644 --- a/source/blender/editors/animation/anim_channels_defines.c +++ b/source/blender/editors/animation/anim_channels_defines.c @@ -4520,8 +4520,8 @@ static void draw_setting_widget(bAnimContext *ac, /* get the base icon for the setting */ switch (setting) { case ACHANNEL_SETTING_VISIBLE: /* visibility eyes */ - // icon = ((enabled) ? ICON_VISIBLE_IPO_ON : ICON_VISIBLE_IPO_OFF); - icon = ICON_VISIBLE_IPO_OFF; + // icon = ((enabled) ? ICON_HIDE_OFF : ICON_HIDE_ON); + icon = ICON_HIDE_ON; if (ELEM(ale->type, ANIMTYPE_FCURVE, ANIMTYPE_NLACURVE)) { tooltip = TIP_("F-Curve is visible in Graph Editor for editing"); diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt index fc94db1cd71..69738d2e008 100644 --- a/source/blender/editors/datafiles/CMakeLists.txt +++ b/source/blender/editors/datafiles/CMakeLists.txt @@ -431,8 +431,6 @@ set(ICON_NAMES key_hlt mute_ipo_off mute_ipo_on - visible_ipo_off - visible_ipo_on driver solo_off solo_on diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h index 340b0f70987..3d2052f1fa9 100644 --- a/source/blender/editors/include/UI_icons.h +++ b/source/blender/editors/include/UI_icons.h @@ -601,8 +601,8 @@ DEF_ICON(KEY_DEHLT) DEF_ICON(KEY_HLT) DEF_ICON(MUTE_IPO_OFF) DEF_ICON(MUTE_IPO_ON) -DEF_ICON(VISIBLE_IPO_OFF) -DEF_ICON(VISIBLE_IPO_ON) +DEF_ICON_BLANK(517) +DEF_ICON_BLANK(516) DEF_ICON(DRIVER) /* ANIMATION */ |