diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-03-07 23:19:56 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-07 23:19:56 +0400 |
commit | 541d239cdceced6067850053e707de3bb6a3c938 (patch) | |
tree | 1b3d2b6c3b932bcdc72d60d13096f5141026f565 /source | |
parent | 0c98a407a2e337ca3a3ba6be602fbbafa2e6a0a0 (diff) |
fix for error in r44711, needed to update sequencer callback.
also quiet some warnings.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/BKE_sequencer.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 3 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_mesh.c | 2 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_mods.c | 8 | ||||
-rw-r--r-- | source/blender/editors/space_clip/clip_ops.c | 4 | ||||
-rw-r--r-- | source/blender/editors/space_sequencer/space_sequencer.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_draw.c | 2 |
7 files changed, 13 insertions, 10 deletions
diff --git a/source/blender/blenkernel/BKE_sequencer.h b/source/blender/blenkernel/BKE_sequencer.h index d54874f1fb8..3812d72d2c9 100644 --- a/source/blender/blenkernel/BKE_sequencer.h +++ b/source/blender/blenkernel/BKE_sequencer.h @@ -336,7 +336,7 @@ struct Sequence *sequencer_add_sound_strip(struct bContext *C, ListBase *seqbase 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 */ diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index cdb2b5318a4..42722c7214c 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -2044,7 +2044,8 @@ static ImBuf * seq_render_scene_strip_impl( /* 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); } diff --git a/source/blender/bmesh/intern/bmesh_mesh.c b/source/blender/bmesh/intern/bmesh_mesh.c index 944b3b434c7..ab8014ce25d 100644 --- a/source/blender/bmesh/intern/bmesh_mesh.c +++ b/source/blender/bmesh/intern/bmesh_mesh.c @@ -358,7 +358,7 @@ static void bm_rationalize_normals(BMesh *bm, int undo) 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)) { diff --git a/source/blender/bmesh/intern/bmesh_mods.c b/source/blender/bmesh/intern/bmesh_mods.c index f47d9c0bc36..dac95dfcfc0 100644 --- a/source/blender/bmesh/intern/bmesh_mods.c +++ b/source/blender/bmesh/intern/bmesh_mods.c @@ -830,10 +830,11 @@ void BM_edge_rotate_calc(BMesh *bm, BMEdge *e, int ccw, 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 @@ int BM_edge_rotate_check_degenerate(BMesh *bm, BMEdge *e, } return TRUE; + + /* when assert isnt used */ + (void)bm; } int BM_edge_rotate_check_beauty(BMesh *UNUSED(bm), BMEdge *e, 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]; |