fix for error in r44711, needed to update sequencer callback.

also quiet some warnings.

3 files changed, 3 insertions, 5 deletions

diff --git a/source/blender/editors/space_clip/clip_ops.c b/source/blender/editors/space_clip/clip_ops.c
index d627d0cbfd7..552c62936b6 100644
--- a/source/blender/editors/space_clip/clip_ops.c
+++ b/source/blender/editors/space_clip/clip_ops.c
@@ -898,14 +898,12 @@ static void proxy_startjob(void *pjv, short *stop, short *do_update, float *prog
 	Scene *scene=pj->scene;
 	MovieClip *clip= pj->clip;
 	struct MovieDistortion *distortion= NULL;
-	short tc_flag, size_flag, quality;
+	short size_flag;
 	int cfra, sfra= SFRA, efra= EFRA;
 	int build_sizes[4], build_count= 0;
 	int build_undistort_sizes[4], build_undistort_count= 0;
 
-	tc_flag= clip->proxy.build_tc_flag;
 	size_flag= clip->proxy.build_size_flag;
-	quality= clip->proxy.quality;
 
 	build_count= proxy_bitflag_to_array(size_flag, build_sizes, 0);
 	build_undistort_count= proxy_bitflag_to_array(size_flag, build_undistort_sizes, 1);
diff --git a/source/blender/editors/space_sequencer/space_sequencer.c b/source/blender/editors/space_sequencer/space_sequencer.c
index e19382b0d64..e3e362c53a8 100644
--- a/source/blender/editors/space_sequencer/space_sequencer.c
+++ b/source/blender/editors/space_sequencer/space_sequencer.c
@@ -591,7 +591,7 @@ void ED_spacetype_sequencer(void)
 
 	/* set the sequencer callback when not in background mode */
 	if(G.background==0) {
-		sequencer_view3d_cb= ED_view3d_draw_offscreen_imbuf_simple;
+		sequencer_view3d_cb = ED_view3d_draw_offscreen_imbuf_simple;
 	}
 }
 
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 092938caad3..3a3d5a6683f 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -2456,7 +2456,7 @@ void ED_view3d_draw_offscreen(Scene *scene, View3D *v3d, ARegion *ar,
 			IMB_rect_from_float(bg_ibuf);
 
 		dst_cp = pixels = MEM_callocN(4*sizeof(unsigned char)*bg_ibuf->x*bg_ibuf->y, "draw offscreen clip pixels");
-		cp = bg_ibuf->rect;
+		cp = (unsigned char *)bg_ibuf->rect;
 		for (i = 0; i < bg_ibuf->x*bg_ibuf->y; i++, cp += 4, dst_cp += 4) {
 			dst_cp[0] = cp[0];
 			dst_cp[1] = cp[1];