diff options
| author | Joshua Leung <aligorith@gmail.com> | 2007-06-26 14:08:58 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2007-06-26 14:08:58 +0400 |
| commit | a82b7171a2cd0730d61baee2b3810a54854235dd (patch) | |
| tree | ecd44297b2d8ec9a456cecdc81626174412bd45f /source/blender/src/drawaction.c | |
| parent | cc1a3941cc54ecd4944ad9949d0983a93b27af95 (diff) | |
== Action/IPO Editors - Code Cleanup ==
Added two macros which are used to test if the active Action/IPO editor is displaying data from a scaled NLA-strip.
Diffstat (limited to 'source/blender/src/drawaction.c')
| -rw-r--r-- | source/blender/src/drawaction.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/src/drawaction.c b/source/blender/src/drawaction.c index 357614f24ab..3f80e524ae3 100644 --- a/source/blender/src/drawaction.c +++ b/source/blender/src/drawaction.c @@ -25,7 +25,7 @@ * * The Original Code is: all of this file. * - * Contributor(s): none yet. + * Contributor(s): Joshua Leung * * ***** END GPL/BL DUAL LICENSE BLOCK ***** * Drawing routines for the Action window type @@ -716,7 +716,7 @@ static void draw_channel_strips(SpaceAction *saction) di= glaBegin2DDraw(&scr_rct, &G.v2d->cur); /* if in NLA there's a strip active, map the view */ - if (G.saction->pin==0 && OBACT) + if (NLA_ACTION_SCALED) map_active_strip(di, OBACT, 0); /* start and end of action itself */ @@ -724,7 +724,7 @@ static void draw_channel_strips(SpaceAction *saction) gla2DDrawTranslatePt(di, sta, 0.0f, &act_start, &dummy); gla2DDrawTranslatePt(di, end, 0.0f, &act_end, &dummy); - if (G.saction->pin==0 && OBACT) + if (NLA_ACTION_SCALED) map_active_strip(di, OBACT, 1); /* first backdrop strips */ @@ -795,7 +795,7 @@ static void draw_channel_strips(SpaceAction *saction) } glDisable(GL_BLEND); - if (G.saction->pin==0 && OBACT) + if (NLA_ACTION_SCALED) map_active_strip(di, OBACT, 0); /* keyframes */ |