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/blender/editors/space_view3d/view3d_draw.c | |
parent | 0c98a407a2e337ca3a3ba6be602fbbafa2e6a0a0 (diff) |
fix for error in r44711, needed to update sequencer callback.
also quiet some warnings.
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_draw.c')
-rw-r--r-- | source/blender/editors/space_view3d/view3d_draw.c | 2 |
1 files changed, 1 insertions, 1 deletions
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]; |