From 88c2c67ae4fe709a02af5c1565bbe116035000ee Mon Sep 17 00:00:00 2001 From: Pablo Vazquez Date: Sat, 18 Oct 2025 00:05:23 +0200 Subject: [PATCH] UI: Color Interpolation Icons Color the interpolation icons matching the new interpolation theme settings added in 75eaecf350 This makes a clearer connection with the lines drawn in Dope Sheet. See PR for details and screenshots. Pull Request: https://projects.blender.org/blender/blender/pulls/148215 --- release/datafiles/icons_svg/ipo_back.svg | 2 +- release/datafiles/icons_svg/ipo_bounce.svg | 2 +- release/datafiles/icons_svg/ipo_circ.svg | 2 +- release/datafiles/icons_svg/ipo_constant.svg | 2 +- release/datafiles/icons_svg/ipo_cubic.svg | 2 +- release/datafiles/icons_svg/ipo_elastic.svg | 2 +- release/datafiles/icons_svg/ipo_expo.svg | 2 +- release/datafiles/icons_svg/ipo_linear.svg | 2 +- release/datafiles/icons_svg/ipo_quad.svg | 2 +- release/datafiles/icons_svg/ipo_quart.svg | 2 +- release/datafiles/icons_svg/ipo_quint.svg | 2 +- release/datafiles/icons_svg/ipo_sine.svg | 2 +- source/blender/editors/include/UI_icons.hh | 24 +++++++++---------- .../editors/interface/interface_icons.cc | 3 +++ 14 files changed, 27 insertions(+), 24 deletions(-) diff --git a/release/datafiles/icons_svg/ipo_back.svg b/release/datafiles/icons_svg/ipo_back.svg index 686e6c08f2a..63aa29f2a6f 100644 --- a/release/datafiles/icons_svg/ipo_back.svg +++ b/release/datafiles/icons_svg/ipo_back.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/release/datafiles/icons_svg/ipo_bounce.svg b/release/datafiles/icons_svg/ipo_bounce.svg index 7c3d196de23..b2d79c9e711 100644 --- a/release/datafiles/icons_svg/ipo_bounce.svg +++ b/release/datafiles/icons_svg/ipo_bounce.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/release/datafiles/icons_svg/ipo_circ.svg b/release/datafiles/icons_svg/ipo_circ.svg index c9710544b42..0d6c66aee15 100644 --- a/release/datafiles/icons_svg/ipo_circ.svg +++ b/release/datafiles/icons_svg/ipo_circ.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/release/datafiles/icons_svg/ipo_constant.svg b/release/datafiles/icons_svg/ipo_constant.svg index 63009940413..06918a2ffa9 100644 --- a/release/datafiles/icons_svg/ipo_constant.svg +++ b/release/datafiles/icons_svg/ipo_constant.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/release/datafiles/icons_svg/ipo_cubic.svg b/release/datafiles/icons_svg/ipo_cubic.svg index 331a755e072..6e602e41c28 100644 --- a/release/datafiles/icons_svg/ipo_cubic.svg +++ b/release/datafiles/icons_svg/ipo_cubic.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/release/datafiles/icons_svg/ipo_elastic.svg b/release/datafiles/icons_svg/ipo_elastic.svg index 96db627cdfe..c86b5784da5 100644 --- a/release/datafiles/icons_svg/ipo_elastic.svg +++ b/release/datafiles/icons_svg/ipo_elastic.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/release/datafiles/icons_svg/ipo_expo.svg b/release/datafiles/icons_svg/ipo_expo.svg index 01f5a59094d..bc84072d64c 100644 --- a/release/datafiles/icons_svg/ipo_expo.svg +++ b/release/datafiles/icons_svg/ipo_expo.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/release/datafiles/icons_svg/ipo_linear.svg b/release/datafiles/icons_svg/ipo_linear.svg index ed954383f1f..a16a9fd4960 100644 --- a/release/datafiles/icons_svg/ipo_linear.svg +++ b/release/datafiles/icons_svg/ipo_linear.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/release/datafiles/icons_svg/ipo_quad.svg b/release/datafiles/icons_svg/ipo_quad.svg index 26e1c777d69..e25b7c8b729 100644 --- a/release/datafiles/icons_svg/ipo_quad.svg +++ b/release/datafiles/icons_svg/ipo_quad.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/release/datafiles/icons_svg/ipo_quart.svg b/release/datafiles/icons_svg/ipo_quart.svg index eec0aedd8a1..f24036b9ad5 100644 --- a/release/datafiles/icons_svg/ipo_quart.svg +++ b/release/datafiles/icons_svg/ipo_quart.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/release/datafiles/icons_svg/ipo_quint.svg b/release/datafiles/icons_svg/ipo_quint.svg index dea51df0099..7b03de3a039 100644 --- a/release/datafiles/icons_svg/ipo_quint.svg +++ b/release/datafiles/icons_svg/ipo_quint.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/release/datafiles/icons_svg/ipo_sine.svg b/release/datafiles/icons_svg/ipo_sine.svg index 5559de35169..2478eb92778 100644 --- a/release/datafiles/icons_svg/ipo_sine.svg +++ b/release/datafiles/icons_svg/ipo_sine.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/source/blender/editors/include/UI_icons.hh b/source/blender/editors/include/UI_icons.hh index c2d8d0f6ace..a969c5a39d4 100644 --- a/source/blender/editors/include/UI_icons.hh +++ b/source/blender/editors/include/UI_icons.hh @@ -593,22 +593,22 @@ DEF_ICON(HANDLE_AUTO) DEF_ICON(HANDLE_AUTOCLAMPED) DEF_ICON(HANDLE_FREE) DEF_ICON(HANDLE_VECTOR) -DEF_ICON(IPO_BACK) +DEF_ICON_COLOR(IPO_BACK) DEF_ICON(IPO_BEZIER) -DEF_ICON(IPO_BOUNCE) -DEF_ICON(IPO_CIRC) -DEF_ICON(IPO_CONSTANT) -DEF_ICON(IPO_CUBIC) +DEF_ICON_COLOR(IPO_BOUNCE) +DEF_ICON_COLOR(IPO_CIRC) +DEF_ICON_COLOR(IPO_CONSTANT) +DEF_ICON_COLOR(IPO_CUBIC) DEF_ICON(IPO_EASE_IN_OUT) DEF_ICON(IPO_EASE_IN) DEF_ICON(IPO_EASE_OUT) -DEF_ICON(IPO_ELASTIC) -DEF_ICON(IPO_EXPO) -DEF_ICON(IPO_LINEAR) -DEF_ICON(IPO_QUAD) -DEF_ICON(IPO_QUART) -DEF_ICON(IPO_QUINT) -DEF_ICON(IPO_SINE) +DEF_ICON_COLOR(IPO_ELASTIC) +DEF_ICON_COLOR(IPO_EXPO) +DEF_ICON_COLOR(IPO_LINEAR) +DEF_ICON_COLOR(IPO_QUAD) +DEF_ICON_COLOR(IPO_QUART) +DEF_ICON_COLOR(IPO_QUINT) +DEF_ICON_COLOR(IPO_SINE) DEF_ICON(KEY_DEHLT) DEF_ICON(KEY_HLT) DEF_ICON(KEYFRAME_HLT) diff --git a/source/blender/editors/interface/interface_icons.cc b/source/blender/editors/interface/interface_icons.cc index cf5aca96719..5b584c01a9e 100644 --- a/source/blender/editors/interface/interface_icons.cc +++ b/source/blender/editors/interface/interface_icons.cc @@ -1517,6 +1517,9 @@ static void svg_replace_color_attributes(std::string &svg, {"blender_crease", nullptr, TH_CREASE}, {"blender_seam", nullptr, TH_SEAM}, {"blender_sharp", nullptr, TH_SHARP}, + {"blender_ipo_linear", btheme->space_action.anim_interpolation_linear}, + {"blender_ipo_constant", btheme->space_action.anim_interpolation_constant}, + {"blender_ipo_other", btheme->space_action.anim_interpolation_other}, }; for (const ColorItem &item : items) {