[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46659] trunk/blender/source/blender/ editors/space_clip/clip_editor.c: Fix #31449: multiple ClipEditor bug behaviour
Sergey Sharybin
sergey.vfx at gmail.com
Tue May 15 14:25:26 CEST 2012
Revision: 46659
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46659
Author: nazgul
Date: 2012-05-15 12:25:26 +0000 (Tue, 15 May 2012)
Log Message:
-----------
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.
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_clip/clip_editor.c
Modified: trunk/blender/source/blender/editors/space_clip/clip_editor.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/clip_editor.c 2012-05-15 12:17:56 UTC (rev 46658)
+++ trunk/blender/source/blender/editors/space_clip/clip_editor.c 2012-05-15 12:25:26 UTC (rev 46659)
@@ -142,7 +142,7 @@
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 @@
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;
}
More information about the Bf-blender-cvs
mailing list