[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44716] trunk/blender/source/blender: fix for error in r44711, needed to update sequencer callback.

[Campbell Barton]

Revision: 44716
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44716
Author:   campbellbarton
Date:     2012-03-07 19:19:56 +0000 (Wed, 07 Mar 2012)
Log Message:
-----------
fix for error in r44711, needed to update sequencer callback.
also quiet some warnings.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44711

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_sequencer.h
    trunk/blender/source/blender/blenkernel/intern/sequencer.c
    trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c
    trunk/blender/source/blender/bmesh/intern/bmesh_mods.c
    trunk/blender/source/blender/editors/space_clip/clip_ops.c
    trunk/blender/source/blender/editors/space_sequencer/space_sequencer.c
    trunk/blender/source/blender/editors/space_view3d/view3d_draw.c

Modified: trunk/blender/source/blender/blenkernel/BKE_sequencer.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_sequencer.h	2012-03-07 19:14:38 UTC (rev 44715)
+++ trunk/blender/source/blender/blenkernel/BKE_sequencer.h	2012-03-07 19:19:56 UTC (rev 44716)
@@ -336,7 +336,7 @@
 struct Sequence *sequencer_add_movie_strip(struct bContext *C, ListBase *seqbasep, struct SeqLoadInfo *seq_load);
 
 /* view3d draw callback, run when not in background view */
-typedef struct ImBuf *(*SequencerDrawView)(struct Scene *, struct Object *, int, int, unsigned int, int, char[256]);
+typedef struct ImBuf *(*SequencerDrawView)(struct Scene *, struct Object *, int, int, unsigned int, int, int, char[256]);
 extern SequencerDrawView sequencer_view3d_cb;
 
 /* copy/paste */

Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c	2012-03-07 19:14:38 UTC (rev 44715)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c	2012-03-07 19:19:56 UTC (rev 44716)
@@ -2044,7 +2044,8 @@
 
 		/* opengl offscreen render */
 		scene_update_for_newframe(context.bmain, scene, scene->lay);
-		ibuf= sequencer_view3d_cb(scene, camera, context.rectx, context.recty, IB_rect, context.scene->r.seq_prev_type, err_out);
+		ibuf = sequencer_view3d_cb(scene, camera, context.rectx, context.recty,
+		                           IB_rect, context.scene->r.seq_prev_type, FALSE, err_out);
 		if(ibuf == NULL) {
 			fprintf(stderr, "seq_render_scene_strip_impl failed to get opengl buffer: %s\n", err_out);
 		}

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c	2012-03-07 19:14:38 UTC (rev 44715)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c	2012-03-07 19:19:56 UTC (rev 44716)
@@ -358,7 +358,7 @@
 	BMO_op_finish(bm, &bmop);
 }
 
-static void bm_mdisps_space_set(BMesh *bm, int from, int to)
+static void UNUSED_FUNCTION(bm_mdisps_space_set)(BMesh *bm, int from, int to)
 {
 	/* switch multires data out of tangent space */
 	if (CustomData_has_layer(&bm->ldata, CD_MDISPS)) {

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_mods.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_mods.c	2012-03-07 19:14:38 UTC (rev 44715)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_mods.c	2012-03-07 19:19:56 UTC (rev 44716)
@@ -830,10 +830,11 @@
 		SWAP(BMFace *, fa, fb);
 	}
 
-
-
 	*r_l1 = BM_face_other_vert_loop(fb, v2, v1);
 	*r_l2 = BM_face_other_vert_loop(fa, v1, v2);
+
+	/* when assert isnt used */
+	(void)bm;
 }
 
 /**
@@ -970,6 +971,9 @@
 	}
 
 	return TRUE;
+
+	/* when assert isnt used */
+	(void)bm;
 }
 
 int BM_edge_rotate_check_beauty(BMesh *UNUSED(bm), BMEdge *e,

Modified: trunk/blender/source/blender/editors/space_clip/clip_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/clip_ops.c	2012-03-07 19:14:38 UTC (rev 44715)
+++ trunk/blender/source/blender/editors/space_clip/clip_ops.c	2012-03-07 19:19:56 UTC (rev 44716)
@@ -898,14 +898,12 @@
 	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);

Modified: trunk/blender/source/blender/editors/space_sequencer/space_sequencer.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/space_sequencer.c	2012-03-07 19:14:38 UTC (rev 44715)
+++ trunk/blender/source/blender/editors/space_sequencer/space_sequencer.c	2012-03-07 19:19:56 UTC (rev 44716)
@@ -591,7 +591,7 @@
 
 	/* 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;
 	}
 }
 

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_draw.c	2012-03-07 19:14:38 UTC (rev 44715)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_draw.c	2012-03-07 19:19:56 UTC (rev 44716)
@@ -2456,7 +2456,7 @@
 			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];