Fix T60821: highlighting issues in Dope Sheet
authorPhilipp Oeser <info@graphics-engineer.com>
Thu, 28 Mar 2019 12:39:50 +0000 (13:39 +0100)
committerPhilipp Oeser <info@graphics-engineer.com>
Mon, 8 Apr 2019 18:34:05 +0000 (20:34 +0200)
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

source/blender/editors/animation/anim_channels_defines.c

index 618ac8f..1bddc62 100644 (file)
@@ -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