svn merge ^/trunk/blender -r47058:47067

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

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

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

diff --cc source/blender/makesrna/intern/rna_nodetree.c
index b76118617cf3dade362e321f1eda6f60a299510f,2a850da58b027c8eabf67150c396da8cae5d3a7b..d827799926ee9fd77a8ce6fc02bcd2edfe5c4f80
--- 1/source/blender/makesrna/intern/rna_nodetree.c
--- 2/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@@ -2992,21 -3034,9 +3034,21 @@@ static void def_cmp_moviedistortion(Str
        RNA_def_property_enum_sdna(prop, NULL, "custom1");
        RNA_def_property_enum_items(prop, distortion_type_items);
        RNA_def_property_ui_text(prop, "Distortion", "Distortion to use to filter image");
-       RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+       RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
  }
  
 +static void def_cmp_mask(StructRNA *srna)
 +{
 +      PropertyRNA *prop;
 +
 +      prop = RNA_def_property(srna, "mask", PROP_POINTER, PROP_NONE);
 +      RNA_def_property_pointer_sdna(prop, NULL, "id");
 +      RNA_def_property_struct_type(prop, "Mask");
 +      RNA_def_property_flag(prop, PROP_EDITABLE);
 +      RNA_def_property_ui_text(prop, "Mask", "");
 +      RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
 +}
 +
  static void dev_cmd_transform(StructRNA *srna)
  {
        PropertyRNA *prop;