Merging r50160 through r50161 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 23 Aug 2012 16:15:37 +0000 (16:15 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 23 Aug 2012 16:15:37 +0000 (16:15 +0000)
1  2 
source/blender/editors/space_sequencer/sequencer_draw.c

@@@ -828,9 -859,6 +863,8 @@@ void draw_image_seq(const bContext *C, 
        float col[3];
        GLuint texid;
        GLuint last_texid;
-       SeqRenderData context;
 +      unsigned char *display_buffer;
 +      void *cache_handle = NULL;
  
        render_size = sseq->render_size;
        if (render_size == 0) {