diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-02-23 22:51:24 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-02-23 22:51:24 +0400 |
commit | 2254d2bdca372086cf51ddbcfd4e2f6e15e43b0d (patch) | |
tree | 0d220f6cf961693315f437f3d11fab57ce345882 /source/blender/editors/space_clip | |
parent | 6871860cfe4b7b706a90e57928e7a85eb9de2aad (diff) |
Fix #30323: Graph view in the Movie Clip Editor does not stay open
In fact, Graph View wasn't been supposed to be opened in Clip show editor mode.
Made curves view unavailable from Clip view mode and store it's alignment in
a runtime flag in SpaceClip structure.
Diffstat (limited to 'source/blender/editors/space_clip')
-rw-r--r-- | source/blender/editors/space_clip/space_clip.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/source/blender/editors/space_clip/space_clip.c b/source/blender/editors/space_clip/space_clip.c index 97da05e3f76..9edf4fab280 100644 --- a/source/blender/editors/space_clip/space_clip.c +++ b/source/blender/editors/space_clip/space_clip.c @@ -244,7 +244,6 @@ static void clip_listener(ScrArea *sa, wmNotifier *wmn) /* no break! */ case ND_FRAME_RANGE: - ED_area_tag_refresh(sa); ED_area_tag_redraw(sa); break; } @@ -611,6 +610,16 @@ static void clip_refresh(const bContext *C, ScrArea *sa) ar_main->alignment= RGN_ALIGN_NONE; view_changed= 1; } + if (ar_preview && ar_preview->alignment != RGN_ALIGN_NONE) { + /* store graph region align */ + if (ar_preview->alignment == RGN_ALIGN_TOP) + sc->runtime_flag &= ~SC_GRAPH_BOTTOM; + else + sc->runtime_flag |= SC_GRAPH_BOTTOM; + + ar_preview->alignment= RGN_ALIGN_NONE; + view_changed= 1; + } break; case SC_VIEW_GRAPH: if (ar_preview && (ar_preview->flag & RGN_FLAG_HIDDEN)) { @@ -624,7 +633,11 @@ static void clip_refresh(const bContext *C, ScrArea *sa) view_changed= 1; } if (ar_preview && !ELEM(ar_preview->alignment, RGN_ALIGN_TOP, RGN_ALIGN_BOTTOM)) { - ar_preview->alignment= RGN_ALIGN_TOP; + if (sc->runtime_flag & SC_GRAPH_BOTTOM) + ar_preview->alignment= RGN_ALIGN_BOTTOM; + else + ar_preview->alignment= RGN_ALIGN_TOP; + view_changed= 1; } break; |