Merging r49191 through r49211 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 25 Jul 2012 15:07:47 +0000 (15:07 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 25 Jul 2012 15:07:47 +0000 (15:07 +0000)
1  2 
release/scripts/startup/bl_ui/space_clip.py
release/scripts/startup/bl_ui/space_image.py
source/blender/editors/include/ED_clip.h
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_clip/space_clip.c
source/blender/editors/space_image/image_buttons.c
source/blender/editors/space_image/image_draw.c
source/blender/editors/space_image/image_ops.c
source/blender/editors/space_image/space_image.c
source/blender/makesdna/DNA_space_types.h
source/blender/makesrna/intern/rna_space.c

index e5ccf2f57afd7adcec9e0447f4b70ffc09933fd0,aaa2676c4c2f9f06b1326375607e92ada8d9d3bb..e959ddba86ff46e997987026407e084539c6301a
@@@ -775,10 -751,10 +775,10 @@@ void draw_image_main(const bContext *C
        else if (ima && (ima->tpageflag & IMA_TILES))
                draw_image_buffer_tiled(sima, ar, scene, ima, ibuf, 0.0f, 0.0, zoomx, zoomy);
        else
 -              draw_image_buffer(sima, ar, scene, ima, ibuf, 0.0f, 0.0f, zoomx, zoomy);
 +              draw_image_buffer(win, sima, ar, scene, ima, ibuf, 0.0f, 0.0f, zoomx, zoomy);
  
        /* paint helpers */
-       if (sima->flag & SI_DRAWTOOL)
+       if (sima->mode == SI_MODE_PAINT)
                draw_image_paint_helpers(ar, scene, zoomx, zoomy);
  
  
index 111e6e76a7de78b24aa5dc354ca46b97cc2c10a6,8760b5d551fa8e2c801987b2669d0401d7ebc837..721809926cbe0b694d3121b3610d3c6e88eae4dc
@@@ -387,12 -146,10 +146,12 @@@ static SpaceLink *image_new(const bCont
        
        simage = MEM_callocN(sizeof(SpaceImage), "initimage");
        simage->spacetype = SPACE_IMAGE;
-       simage->zoom = 1;
-       simage->lock = 1;
+       simage->zoom = 1.0f;
+       simage->lock = TRUE;
  
-       simage->iuser.ok = 1;
 +      BKE_color_managed_view_settings_init(&simage->view_settings);
 +
+       simage->iuser.ok = TRUE;
        simage->iuser.fie_ima = 2;
        simage->iuser.frames = 100;
        
index ed9e82368936f37d59379fab8ec46292be41e786,acfd413fddef3dcb5fb212463b4aaac57e297f61..94b8254efbbcfcd9e4acda0d3003c258c1a132fa
@@@ -2064,12 -2077,10 +2078,15 @@@ static void rna_def_space_image(Blender
        RNA_def_property_clear_flag(prop, PROP_EDITABLE);
        RNA_def_property_ui_text(prop, "Show UV Editor", "Show UV editing related properties");
  
 +      prop = RNA_def_property(srna, "view_settings", PROP_POINTER, PROP_NONE);
 +      RNA_def_property_pointer_sdna(prop, NULL, "view_settings");
 +      RNA_def_property_struct_type(prop, "ColorManagedViewSettings");
 +      RNA_def_property_ui_text(prop, "View Settings", "Color management settings used for displaying images on the display");
 +
        rna_def_space_image_uv(brna);
+       /* mask */
+       rna_def_space_mask_info(srna, NC_SPACE | ND_SPACE_IMAGE, "rna_SpaceImageEditor_mask_set");
  }
  
  static void rna_def_space_sequencer(BlenderRNA *brna)