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-03-14 09:01:51 +0400
committerJoshua Leung <aligorith@gmail.com>2013-03-14 09:01:51 +0400
commitdaf3fc02ada12592a7dd3f010b4daa3ac546e987 (patch)
tree795a27329436c7424f562f6461992ee754ae233d /source/blender/editors/space_nla
parent568435285801db081824d5873e43911764fff5a0 (diff)
Bugfix: Selecting AnimData "expanders" in AnimEditors works again
Somewhere along the line, this functionality broke, even though the code to handle these settings was still in place for many of these. The main implication of this fix is that it should now be possible to select a particular AnimData block, which makes it possible to do things such as changing the action associated with that AnimData block (i.e. via the "Animation Data" panel in the NLA Editor), as well as other operations which I've had on the todolist for a while. Stay tuned!
Diffstat (limited to 'source/blender/editors/space_nla')
-rw-r--r--source/blender/editors/space_nla/nla_channels.c2
-rw-r--r--source/blender/editors/space_nla/nla_draw.c1
2 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/editors/space_nla/nla_channels.c b/source/blender/editors/space_nla/nla_channels.c
index bfe2a3484b8..07e6d9bca11 100644
--- a/source/blender/editors/space_nla/nla_channels.c
+++ b/source/blender/editors/space_nla/nla_channels.c
@@ -140,7 +140,7 @@ static int mouse_nla_channels(bAnimContext *ac, float x, int channel_index, shor
}
else {
Base *b;
-
+
/* deselect all */
/* TODO: should this deselect all other types of channels too? */
for (b = sce->base.first; b; b = b->next) {
diff --git a/source/blender/editors/space_nla/nla_draw.c b/source/blender/editors/space_nla/nla_draw.c
index acfb4a51b14..242192218c8 100644
--- a/source/blender/editors/space_nla/nla_draw.c
+++ b/source/blender/editors/space_nla/nla_draw.c
@@ -759,7 +759,6 @@ static void draw_nla_channel_list_gl(bAnimContext *ac, ListBase *anim_data, View
glEnable(GL_BLEND);
/* draw backing strip behind channel name */
- // FIXME: hardcoded colors!!!
if (group == 5) {
float color[4];