diff options
| author | Joshua Leung <aligorith@gmail.com> | 2007-01-05 02:39:09 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2007-01-05 02:39:09 +0300 |
| commit | 8fe3de061838938d3ee08911237f8d1ee895df28 (patch) | |
| tree | b94081b1a751e42fbd2e9117034e867ec50a44a0 /source/blender/src/drawnla.c | |
| parent | 8039ad32df87fe2e5904a993b9ea7bbc477c2c19 (diff) | |
== NLA Editor - Object Collapsing ==
Now, objects without actions/nlastrips cannot get collapsed anymore
as it didn't make sense. The open/close triangle is no longer shown
for these.
Also, I went through and made sure all the NLA tools to comply with this.
This fixes bug #5591.
Diffstat (limited to 'source/blender/src/drawnla.c')
| -rw-r--r-- | source/blender/src/drawnla.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/src/drawnla.c b/source/blender/src/drawnla.c index 7a5e0c66fdd..9c6870a9483 100644 --- a/source/blender/src/drawnla.c +++ b/source/blender/src/drawnla.c @@ -134,10 +134,12 @@ static void draw_nla_channels(void) glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA) ; /* icon to indicate expanded or collapsed */ - if (ob->nlaflag & OB_NLA_COLLAPSED) - BIF_icon_draw(x+1, y-8, ICON_TRIA_RIGHT); - else - BIF_icon_draw(x+1, y-8, ICON_TRIA_DOWN); + if ((ob->nlastrips.first) || (ob->action)) { + if (ob->nlaflag & OB_NLA_COLLAPSED) + BIF_icon_draw(x+1, y-8, ICON_TRIA_RIGHT); + else + BIF_icon_draw(x+1, y-8, ICON_TRIA_DOWN); + } /* icon to indicate nla or action */ if(ob->nlastrips.first && ob->action) { |