blender
/
blender
128
396
Fork 568
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

Animation: Enable Pin Icon in the Dope Sheet 

Even though the dope sheet respects the pinned channels, it did not show the icon to interact with the pinned state.

This adds the icon to the dope sheet as well.

{F14178715}

Reviewed by: Sybren A. Stüvel
Differential Revision: https://developer.blender.org/D17061
Ref: D17061
This commit is contained in:
Christoph Lendenfeld 2023-02-02 13:58:13 +01:00
parent bbc18673f3
commit 49ad91b5ab
Notes: blender-bot 2023-02-22 10:10:30 +01:00 
Referenced by issue #105009, Regression: Eye icon visible twice in dope sheet for stroke objects
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/editors/animation/anim_channels_defines.c
View File

@ -929,7 +929,7 @@ static bool acf_group_setting_valid(bAnimContext *ac,
return (ac->spacetype == SPACE_GRAPH);
case ACHANNEL_SETTING_ALWAYS_VISIBLE:
return (ac->spacetype == SPACE_GRAPH);
return ELEM(ac->spacetype, SPACE_ACTION, SPACE_GRAPH);
default: /* always supported */
return true;
@ -4434,7 +4434,7 @@ void ANIM_channel_draw(
* - in Grease Pencil mode, color swatches for layer color
*/
if (ac->sl) {
if ((ac->spacetype == SPACE_GRAPH) &&
if (ELEM(ac->spacetype, SPACE_ACTION, SPACE_GRAPH) &&
(acf->has_setting(ac, ale, ACHANNEL_SETTING_VISIBLE) ||
acf->has_setting(ac, ale, ACHANNEL_SETTING_ALWAYS_VISIBLE))) {
/* for F-Curves, draw color-preview of curve left to the visibility icon */
@ -5177,7 +5177,7 @@ void ANIM_channel_draw_widgets(const bContext *C,
* - in Grease Pencil mode, color swatches for layer color
*/
if (ac->sl) {
if ((ac->spacetype == SPACE_GRAPH) &&
if (ELEM(ac->spacetype, SPACE_ACTION, SPACE_GRAPH) &&
(acf->has_setting(ac, ale, ACHANNEL_SETTING_VISIBLE) ||
acf->has_setting(ac, ale, ACHANNEL_SETTING_ALWAYS_VISIBLE))) {
/* Pin toggle. */