Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Leung <aligorith@gmail.com>2013-11-20 16:13:30 +0400
committerJoshua Leung <aligorith@gmail.com>2013-11-20 16:33:02 +0400
commitefdd4894e93748e7305d03ca6f32deb869cc2862 (patch)
tree98913f1a70c029be24b1af6d27941afc38dad8d9 /source/blender/editors/animation/anim_channels_defines.c
parent905085228f475b4ca82ba21a6414b5e0a02f49a8 (diff)
NLA Channel Drawing Refactor: Remove rest of old drawing code for NLA Track channels
NLA Track drawing has now been ported over to use the UI widgets like the rest of the anim channels do in the DopeSheet and Graph Editors. The main benefit of this for users is that these buttons will now show tooltips when you hover over them. Hopefully this will help make the "solo" buttons more discoverable. I've decided to postpone porting the "Action Line" channels to the widget system for now, since there are quite a few more issues there which need quite a bit more time to work through.
Diffstat (limited to 'source/blender/editors/animation/anim_channels_defines.c')
-rw-r--r--source/blender/editors/animation/anim_channels_defines.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c
index 7b656da3de3..1d9022e463b 100644
--- a/source/blender/editors/animation/anim_channels_defines.c
+++ b/source/blender/editors/animation/anim_channels_defines.c
@@ -2972,7 +2972,9 @@ static void ANIM_init_channel_typeinfo_data(void)
animchannelTypeInfo[type++] = &ACF_MASKLAYER; /* Mask Layer */
animchannelTypeInfo[type++] = &ACF_NLATRACK; /* NLA Track */
- animchannelTypeInfo[type++] = &ACF_NLAACTION; /* NLA Action */
+
+ // TODO: this channel type still hasn't been ported over yet, since it requires special attention
+ animchannelTypeInfo[type++] = NULL; /* NLA Action */
}
}