Commit: 12417fcbf676198726baac5e8fc883f64f188b55 Author: Philipp Oeser Date: Thu Mar 28 13:39:50 2019 +0100 Branches: master https://developer.blender.org/rB12417fcbf676198726baac5e8fc883f64f188b55
Fix T60821: highlighting issues in Dope Sheet replaced check for (obsolete in 2.8) objects 'SELECT' flag with check for bases 'BASE_SELECTED' flag Reviewers: brecht Maniphest Tasks: T60821 Differential Revision: https://developer.blender.org/D4606 =================================================================== M source/blender/editors/animation/anim_channels_defines.c =================================================================== diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c index 618ac8f6f13..1bddc6268b5 100644 --- a/source/blender/editors/animation/anim_channels_defines.c +++ b/source/blender/editors/animation/anim_channels_defines.c @@ -734,7 +734,7 @@ static int acf_object_setting_flag(bAnimContext *UNUSED(ac), eAnimChannel_Settin switch (setting) { case ACHANNEL_SETTING_SELECT: /* selected */ - return SELECT; + return BASE_SELECTED; case ACHANNEL_SETTING_EXPAND: /* expanded */ *neg = 1; @@ -766,7 +766,7 @@ static void *acf_object_setting_ptr(bAnimListElem *ale, eAnimChannel_Settings se switch (setting) { case ACHANNEL_SETTING_SELECT: /* selected */ - return GET_ACF_FLAG_PTR(ob->flag, type); + return GET_ACF_FLAG_PTR(base->flag, type); case ACHANNEL_SETTING_EXPAND: /* expanded */ return GET_ACF_FLAG_PTR(ob->nlaflag, type); // xxx _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
