[Bf-blender-cvs] [4774657370e] master: UI: remove Visible IPO icons

Campbell Barton noreply at git.blender.org
Sat Jun 22 07:13:30 CEST 2019


Commit: 4774657370e005b3c2b7e4c76885e5ca55a63ccd
Author: Campbell Barton
Date:   Sat Jun 22 15:04:46 2019 +1000
Branches: master
https://developer.blender.org/rB4774657370e005b3c2b7e4c76885e5ca55a63ccd

UI: remove Visible IPO icons

These are duplicates of HIDE_ON/OFF.

===================================================================

D	release/datafiles/blender_icons16/icon16_visible_ipo_off.dat
D	release/datafiles/blender_icons16/icon16_visible_ipo_on.dat
D	release/datafiles/blender_icons32/icon32_visible_ipo_off.dat
D	release/datafiles/blender_icons32/icon32_visible_ipo_on.dat
M	release/scripts/startup/bl_ui/space_clip.py
M	source/blender/editors/animation/anim_channels_defines.c
M	source/blender/editors/datafiles/CMakeLists.txt
M	source/blender/editors/include/UI_icons.h

===================================================================

diff --git a/release/datafiles/blender_icons16/icon16_visible_ipo_off.dat b/release/datafiles/blender_icons16/icon16_visible_ipo_off.dat
deleted file mode 100644
index 4cb9c54a1ce..00000000000
Binary files a/release/datafiles/blender_icons16/icon16_visible_ipo_off.dat and /dev/null differ
diff --git a/release/datafiles/blender_icons16/icon16_visible_ipo_on.dat b/release/datafiles/blender_icons16/icon16_visible_ipo_on.dat
deleted file mode 100644
index 70073f4ef99..00000000000
Binary files a/release/datafiles/blender_icons16/icon16_visible_ipo_on.dat and /dev/null differ
diff --git a/release/datafiles/blender_icons32/icon32_visible_ipo_off.dat b/release/datafiles/blender_icons32/icon32_visible_ipo_off.dat
deleted file mode 100644
index a15bcefd2d3..00000000000
Binary files a/release/datafiles/blender_icons32/icon32_visible_ipo_off.dat and /dev/null differ
diff --git a/release/datafiles/blender_icons32/icon32_visible_ipo_on.dat b/release/datafiles/blender_icons32/icon32_visible_ipo_on.dat
deleted file mode 100644
index 6fb4fd6975a..00000000000
Binary files a/release/datafiles/blender_icons32/icon32_visible_ipo_on.dat and /dev/null differ
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 */



More information about the Bf-blender-cvs mailing list