svn merge ^/trunk/blender -r49177:49186
authorCampbell Barton <ideasman42@gmail.com>
Tue, 24 Jul 2012 21:11:22 +0000 (21:11 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 24 Jul 2012 21:11:22 +0000 (21:11 +0000)
1  2 
source/blender/blenkernel/intern/mask.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_clip/clip_draw.c
source/blender/editors/space_clip/clip_editor.c
source/blender/editors/space_clip/space_clip.c
source/blender/editors/space_image/space_image.c
source/blender/editors/space_sequencer/sequencer_draw.c
source/blender/makesdna/DNA_space_types.h
source/blender/makesrna/intern/rna_space.c

index 894f207051fccf705f9a22420f11dffececbf017,6a6658af4aade0d330675c03a480ab65e88742f5..111e6e76a7de78b24aa5dc354ca46b97cc2c10a6
@@@ -820,9 -824,9 +829,9 @@@ static void image_main_area_draw(const 
  
        /* we set view2d from own zoom and offset each time */
        image_main_area_set_view2d(sima, ar);
-       
        /* we draw image in pixelspace */
 -      draw_image_main(sima, ar, scene);
 +      draw_image_main(C, ar);
  
        /* and uvs in 0.0-1.0 space */
        UI_view2d_view_ortho(v2d);
index e240b2d08068a9c9a3afff63e5ec81359c529192,ac2f8a7a34ccd866ccbf3af882b0d91808f54ce1..15b26fb1b4abd627d56187126d8b974996dec3a2
@@@ -1064,11 -992,19 +1009,21 @@@ void draw_image_seq(const bContext *C, 
  
        //if (sc->mode == SC_MODE_MASKEDIT) {
        if (sseq->mainb == SEQ_DRAW_IMG_IMBUF) {
-               sequencer_main_area_draw_mask(C, scene, ar);
+               Mask *mask = BKE_sequencer_mask_get(scene);
+               if (mask) {
+                       int width, height;
+                       ED_mask_size(C, &width, &height);
+                       ED_mask_draw_region(mask, ar,
+                                           0, 0,  /* TODO */
+                                           width, height,
+                                           FALSE, TRUE,
+                                           NULL, C);
+               }
        }
  
 +      if (cache_handle)
 +              IMB_display_buffer_release(cache_handle);
  }
  
  #if 0
index 03054924cb04a065af39e62e6891fa96d063bb7f,0ab3b74f2e08d0e900476af4e0521c43badc345c..9c4e5b39fccc40ca34604cfb9fb6303d24b562fc
@@@ -693,8 -699,7 +702,10 @@@ typedef struct SpaceImage 
        char dt_uvstretch;
        char around;
  
+       MaskSpaceInfo mask_info;
++
 +      /* **** color management **** */
 +      ColorManagedViewSettings view_settings;
  } SpaceImage;
  
  
@@@ -1021,15 -1023,7 +1032,10 @@@ typedef struct SpaceClip 
  
        int around, pad4;             /* pivot point for transforms */
  
-       /* **** mask editing **** */
-       struct Mask *mask;
-       /* draw options */
-       char mask_draw_flag;
-       char mask_draw_type;
-       char pad3[6];
+       MaskSpaceInfo mask_info;
 +
 +      /* **** color management **** */
 +      ColorManagedViewSettings view_settings;
  } SpaceClip;
  
  /* SpaceClip->flag */