diff options
| author | William Reynish <billreynish> | 2018-10-22 20:19:15 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-10-22 20:28:24 +0300 |
| commit | 43c6aba6705111f93fee903480e96a96c298f97d (patch) | |
| tree | 94f15310c2491df32475b605e627529ae83db9f4 /source/blender/editors/animation/anim_channels_defines.c | |
| parent | efa3389b83e0dbb21b9a3d2131b83ab4ada43ca9 (diff) | |
Fix various icon related issues:
* Used correct icons for Tracking.
* Flip Copy/Paste icons so they are correct.
* Add correct icon for softbody modifier.
* Replace speaker icons for enabling F-Curves with checkboxes.
Diffstat (limited to 'source/blender/editors/animation/anim_channels_defines.c')
| -rw-r--r-- | source/blender/editors/animation/anim_channels_defines.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c index 1dcf0a13055..8873a197aa8 100644 --- a/source/blender/editors/animation/anim_channels_defines.c +++ b/source/blender/editors/animation/anim_channels_defines.c @@ -4255,11 +4255,12 @@ static void draw_setting_widget(bAnimContext *ac, bAnimListElem *ale, const bAni void *ptr; const char *tooltip; uiBut *but = NULL; + bool enabled; /* get the flag and the pointer to that flag */ flag = acf->setting_flag(ac, setting, &negflag); ptr = acf->setting_ptr(ale, setting, &ptrsize); - /* enabled = ANIM_channel_setting_get(ac, ale, setting); */ /* UNUSED */ + enabled = ANIM_channel_setting_get(ac, ale, setting); /* get the base icon for the setting */ switch (setting) { @@ -4312,8 +4313,8 @@ static void draw_setting_widget(bAnimContext *ac, bAnimListElem *ale, const bAni break; case ACHANNEL_SETTING_MUTE: /* muted speaker */ - //icon = ((enabled) ? ICON_MUTE_IPO_ON : ICON_MUTE_IPO_OFF); - icon = ICON_MUTE_IPO_OFF; + icon = ((enabled) ? ICON_CHECKBOX_DEHLT : ICON_CHECKBOX_HLT); + usetoggle = false; if (ELEM(ale->type, ANIMTYPE_FCURVE, ANIMTYPE_NLACURVE)) { tooltip = TIP_("Does F-Curve contribute to result"); |