[Bf-blender-cvs] [92f305a] master: A more forward thinking version of previous commit
Julian Eisel
noreply at git.blender.org
Wed Mar 25 22:23:30 CET 2015
Commit: 92f305a490802812091da4640df552d77f168844
Author: Julian Eisel
Date: Wed Mar 25 22:15:56 2015 +0100
Branches: master
https://developer.blender.org/rB92f305a490802812091da4640df552d77f168844
A more forward thinking version of previous commit
Basically same as 581afa9da37, but I guess we can assume that scopes added in future
to the image preview may also want to use the viewrect from the original ibuf.
===================================================================
M source/blender/editors/space_sequencer/sequencer_draw.c
===================================================================
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c
index c668887..ec4ae5a 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -1079,7 +1079,10 @@ void draw_image_seq(const bContext *C, Scene *scene, ARegion *ar, SpaceSeq *sseq
/* future files may have new scopes we don't catch above */
if (scope) {
scopes->reference_ibuf = ibuf;
- if (!scopes->zebra_ibuf) { /* zebra uses viewrect from orig ibuf */
+ if (sseq->mainb == SEQ_DRAW_IMG_IMBUF) {
+ /* scopes drawn in image preview use viewrect from orig ibuf - currently that's only zebra */
+ }
+ else {
viewrect[0] = scope->x;
viewrect[1] = scope->y;
}
More information about the Bf-blender-cvs
mailing list