fix for error in r44711, needed to update sequencer callback.
also quiet some warnings.
This commit is contained in:
parent
0c98a407a2
commit
541d239cdc
|
@ -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 */
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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)) {
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -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];
|
||||
|
|
Loading…
Reference in New Issue