[Bf-blender-cvs] [171a2c0] wiggly-widgets: Fix compiling errors after Multiview commit

[Julian Eisel]

Commit: 171a2c072fc65a63fee777d42578d1a1abbb8807
Author: Julian Eisel
Date:   Mon Apr 6 23:57:10 2015 +0200
Branches: wiggly-widgets
https://developer.blender.org/rB171a2c072fc65a63fee777d42578d1a1abbb8807

Fix compiling errors after Multiview commit

===================================================================

M       source/blender/editors/screen/area.c
M       source/blender/editors/screen/screen_edit.c
M       source/blender/editors/space_sequencer/sequencer_view.c

===================================================================

diff --git a/source/blender/editors/screen/area.c 
b/source/blender/editors/screen/area.c
index 374bfe0..750a436 100644
--- a/source/blender/editors/screen/area.c
+++ b/source/blender/editors/screen/area.c
@@ -2106,7 +2106,7 @@ void ED_region_draw_backdrop_view3d(const bContext *C, 
struct Object *camera, co
 
        BKE_scene_update_for_newframe(bmain->eval_ctx, bmain, scene, 
scene->lay);
        ibuf = ED_view3d_draw_offscreen_imbuf_simple(scene, camera, width, 
height, (1 << 0),
-                                                    3, false, false, false, 
R_ADDSKY, err_out);
+                                                    3, false, false, false, 
R_ADDSKY, NULL, err_out);
 
        if (ibuf == NULL)
                return;
diff --git a/source/blender/editors/screen/screen_edit.c 
b/source/blender/editors/screen/screen_edit.c
index f3e6060..3a40c30 100644
--- a/source/blender/editors/screen/screen_edit.c
+++ b/source/blender/editors/screen/screen_edit.c
@@ -2196,7 +2196,7 @@ bool ED_screen_stereo3d_required(bScreen *screen)
                                        return true;
                                }
 
-                               if (sseq->draw_flag & SEQ_DRAW_BACKDROP) {
+                               if (sseq->draw_flag & SEQ_DRAW_OVERDROP) {
                                        return true;
                                }
 
diff --git a/source/blender/editors/space_sequencer/sequencer_view.c 
b/source/blender/editors/space_sequencer/sequencer_view.c
index 6983be3..a0b6d19 100644
--- a/source/blender/editors/space_sequencer/sequencer_view.c
+++ b/source/blender/editors/space_sequencer/sequencer_view.c
@@ -450,7 +450,7 @@ static int sequencer_image_transform_widget_invoke(bContext 
*C, wmOperator *op,
                                                             "Seq_Canvas", 
SPACE_SEQ, RGN_TYPE_PREVIEW, false);
        struct wmEventHandler *handler = WM_event_add_modal_handler(C, op);
        ImageTransformData *data = MEM_mallocN(sizeof(ImageTransformData), 
"overdrop transform data");
-       ImBuf *ibuf = sequencer_ibuf_get(CTX_data_main(C), scene, sseq, CFRA, 
0);
+       ImBuf *ibuf = sequencer_ibuf_get(CTX_data_main(C), scene, sseq, CFRA, 
0, NULL);
 
        if (!ibuf || !ED_space_sequencer_check_show_imbuf(sseq)) {
                return OPERATOR_CANCELLED;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs