Bugfix: NLA Channel Borderselect works again
authorJoshua Leung <aligorith@gmail.com>
Mon, 8 Nov 2010 00:09:31 +0000 (00:09 +0000)
committerJoshua Leung <aligorith@gmail.com>
Mon, 8 Nov 2010 00:09:31 +0000 (00:09 +0000)
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/include/ED_anim_api.h

index 6b39565f6f06fd37b502839e6abf1a96a67c92f5..3fe867fa3afadf9a44e57fed9451a497cf92360a 100644 (file)
@@ -1688,6 +1688,16 @@ static void borderselect_anim_channels (bAnimContext *ac, rcti *rect, short sele
                                        agrp->flag &= ~AGRP_ACTIVE;
                                }
                                        break;
+                               case ANIMTYPE_NLATRACK:
+                               {
+                                       NlaTrack *nlt= (NlaTrack *)ale->data;
+                                       
+                                       /* for now, it's easier just to do this here manually, as defining a new type 
+                                        * currently adds complications when doing other stuff 
+                                        */
+                                       ACHANNEL_SET_FLAG(nlt, selectmode, NLATRACK_SELECTED);
+                               }
+                                       break;
                        }
                }
                
index 5fb7fa41752a7f52483fcc579f34315ef5341ca1..40478ddcbc25b20535e263c62cef592b09a01062 100644 (file)
@@ -330,7 +330,7 @@ typedef enum eAnimChannels_SetFlag {
 
 /* types of settings for AnimChannels */
 typedef enum eAnimChannel_Settings {
-        ACHANNEL_SETTING_SELECT = 0,
+       ACHANNEL_SETTING_SELECT = 0,
        ACHANNEL_SETTING_PROTECT,                       // warning: for drawing UI's, need to check if this is off (maybe inverse this later)
        ACHANNEL_SETTING_MUTE,
        ACHANNEL_SETTING_EXPAND,