[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32935] trunk/blender/source/blender/ editors: Bugfix: NLA Channel Borderselect works again
Joshua Leung
aligorith at gmail.com
Mon Nov 8 01:09:31 CET 2010
Revision: 32935
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32935
Author: aligorith
Date: 2010-11-08 01:09:31 +0100 (Mon, 08 Nov 2010)
Log Message:
-----------
Bugfix: NLA Channel Borderselect works again
Modified Paths:
--------------
trunk/blender/source/blender/editors/animation/anim_channels_edit.c
trunk/blender/source/blender/editors/include/ED_anim_api.h
Modified: trunk/blender/source/blender/editors/animation/anim_channels_edit.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_channels_edit.c 2010-11-07 23:22:40 UTC (rev 32934)
+++ trunk/blender/source/blender/editors/animation/anim_channels_edit.c 2010-11-08 00:09:31 UTC (rev 32935)
@@ -1688,6 +1688,16 @@
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;
}
}
Modified: trunk/blender/source/blender/editors/include/ED_anim_api.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_anim_api.h 2010-11-07 23:22:40 UTC (rev 32934)
+++ trunk/blender/source/blender/editors/include/ED_anim_api.h 2010-11-08 00:09:31 UTC (rev 32935)
@@ -330,7 +330,7 @@
/* 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,
More information about the Bf-blender-cvs
mailing list