Merging r49413 through r49450 from trunk into soc-2011-tomato

diff --cc release/scripts/startup/bl_ui/space_image.py
Simple merge

diff --cc release/scripts/startup/bl_ui/space_node.py
Simple merge

diff --cc source/blender/blenkernel/BKE_node.h
Simple merge

diff --cc source/blender/blenkernel/intern/mask.c
index 5db55ff846d713c896f11441ffb00f0b1f79b830,b3f146586a8d2992333c477d6c78e30a0c65f23a..ddba9a7a65b831d7646506fae278cc0af14042ac
--- 1/source/blender/blenkernel/intern/mask.c
--- 2/source/blender/blenkernel/intern/mask.c
+++ b/source/blender/blenkernel/intern/mask.c
@@@ -56,23 -56,6 +56,21 @@@
  #include "BKE_movieclip.h"
  #include "BKE_utildefines.h"
  
- #include "raskter.h"
- 
 +#ifdef USE_MANGO_MASK_CACHE_HACK
 +
 +#include "BLI_threads.h"
 +
 +typedef struct MaskRasterCache {
 +      float *buffer;
 +      int width, height;
 +      short do_aspect_correct;
 +      short do_mask_aa;
 +      short do_feather;
 +
 +      ListBase layers;
 +} MaskRasterCache;
 +#endif
 +
  static MaskSplinePoint *mask_spline_point_next(MaskSpline *spline, MaskSplinePoint *points_array, MaskSplinePoint *point)
  {
        if (point == &points_array[spline->tot_point - 1]) {

diff --cc source/blender/blenloader/intern/readfile.c
Simple merge

diff --cc source/blender/editors/screen/screen_ops.c
Simple merge

diff --cc source/blender/editors/space_clip/clip_draw.c
Simple merge

diff --cc source/blender/editors/space_clip/clip_editor.c
Simple merge

diff --cc source/blender/editors/space_image/space_image.c
Simple merge

diff --cc source/blender/editors/space_node/drawnode.c
Simple merge

diff --cc source/blender/editors/space_node/node_draw.c
Simple merge

diff --cc source/blender/editors/space_sequencer/sequencer_draw.c
Simple merge

diff --cc source/blender/makesdna/DNA_node_types.h
Simple merge

diff --cc source/blender/makesrna/intern/rna_nodetree.c
Simple merge

diff --cc source/blender/makesrna/intern/rna_space.c
index 73661937fcda3665b7adfc7d3b900ea781212322,793eb2b7185d17ceee4763305824352e1c229ddd..f0395a4623179bfeea4263c97e833047a398691a
--- 1/source/blender/makesrna/intern/rna_space.c
--- 2/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@@ -2078,11 -2084,11 +2085,16 @@@ 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");
 +
+       prop = RNA_def_property(srna, "show_maskedit", PROP_BOOLEAN, PROP_NONE);
+       RNA_def_property_boolean_funcs(prop, "rna_SpaceImageEditor_show_maskedit_get", NULL);
+       RNA_def_property_clear_flag(prop, PROP_EDITABLE);
+       RNA_def_property_ui_text(prop, "Show Mask Editor", "Show Mask editing related properties");
+ 
        rna_def_space_image_uv(brna);
  
        /* mask */

diff --cc source/blender/render/extern/include/RE_pipeline.h
Simple merge

diff --cc source/blender/render/intern/source/pipeline.c
Simple merge

diff --cc source/blender/windowmanager/intern/wm_init_exit.c
Simple merge

diff --cc source/blenderplayer/bad_level_call_stubs/stubs.c
Simple merge