diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-05-15 16:25:26 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-05-15 16:25:26 +0400 |
| commit | 7050633c6716b7f28aef906f47ec2793119d0a49 (patch) | |
| tree | b7da1161eb396a8bef1e5fc56be5e76cfb479cbc /source/blender/editors | |
| parent | a20da2599b759e8cd7934a59ad7e908289cb0428 (diff) | |
Fix #31449: multiple ClipEditor bug behaviour
Actually it wasn't a bug -- currently curve/dopesheet view are in separated
spaces, so to keep displaying data in sync it's needed to update all visible
clip editors when changing displaying clip datablock.
Changed logic here a bit, so current clip wouldn't be changes for clip editors
where view is set to CLIP, only dopesheet/graph views are getting updated.
Also do not update displaying clip datablock when changing it from curve/dopesheet.
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/space_clip/clip_editor.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_clip/clip_editor.c b/source/blender/editors/space_clip/clip_editor.c index ed9265deeb2..a477a7435fd 100644 --- a/source/blender/editors/space_clip/clip_editor.c +++ b/source/blender/editors/space_clip/clip_editor.c @@ -142,7 +142,7 @@ void ED_space_clip_set(bContext *C, bScreen *screen, SpaceClip *sc, MovieClip *c if (sc->clip && sc->clip->id.us == 0) sc->clip->id.us = 1; - if (screen) { + if (screen && sc->view == SC_VIEW_CLIP) { ScrArea *area; SpaceLink *sl; @@ -151,7 +151,7 @@ void ED_space_clip_set(bContext *C, bScreen *screen, SpaceClip *sc, MovieClip *c if (sl->spacetype == SPACE_CLIP) { SpaceClip *cur_sc = (SpaceClip *) sl; - if (cur_sc != sc) { + if (cur_sc != sc && cur_sc->view != SC_VIEW_CLIP) { if (cur_sc->clip == old_clip || cur_sc->clip == NULL) { cur_sc->clip = clip; } |