svn merge ^/trunk/blender -r47150:47184

diff --cc source/blender/CMakeLists.txt
Simple merge

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

diff --cc source/blender/blenkernel/CMakeLists.txt
Simple merge

diff --cc source/blender/blenkernel/intern/node.c
Simple merge

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

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

diff --cc source/blender/editors/space_node/drawnode.c
index 4c5befda8dfd497b17eb4d7440aa4934ff61845f,97e7cff6f09f3bfec78e07c4508d2e716b496606..2db808e7a599cb48705d36cea14ffc4792a04b75
--- 1/source/blender/editors/space_node/drawnode.c
--- 2/source/blender/editors/space_node/drawnode.c
+++ b/source/blender/editors/space_node/drawnode.c
@@@ -2389,41 -2288,6 +2288,41 @@@ static void node_composit_buts_viewer_b
        }
  }
  
-       bNode *node= ptr->data;
 +static void node_composit_buts_mask(uiLayout *layout, bContext *C, PointerRNA *ptr)
 +{
 +      uiTemplateID(layout, C, ptr, "mask", NULL, NULL, NULL);
 +}
 +
 +static void node_composit_buts_keyingscreen(uiLayout *layout, bContext *C, PointerRNA *ptr)
 +{
 +      bNode *node= ptr->data;
 +
 +      uiTemplateID(layout, C, ptr, "clip", NULL, NULL, NULL);
 +
 +      if (node->id) {
 +              MovieClip *clip = (MovieClip *) node->id;
 +              uiLayout *col;
 +              PointerRNA tracking_ptr;
 +
 +              RNA_pointer_create(&clip->id, &RNA_MovieTracking, &clip->tracking, &tracking_ptr);
 +
 +              col = uiLayoutColumn(layout, 1);
 +              uiItemPointerR(col, ptr, "tracking_object", &tracking_ptr, "objects", "", ICON_OBJECT_DATA);
 +      }
 +}
 +
 +static void node_composit_buts_keying(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
 +{
++      /* bNode *node= ptr->data; */ /* UNUSED */
 +
 +      uiItemR(layout, ptr, "blur_pre", 0, NULL, ICON_NONE);
 +      uiItemR(layout, ptr, "despill_factor", 0, NULL, ICON_NONE);
 +      uiItemR(layout, ptr, "clip_black", 0, NULL, ICON_NONE);
 +      uiItemR(layout, ptr, "clip_white", 0, NULL, ICON_NONE);
 +      uiItemR(layout, ptr, "dilate_distance", 0, NULL, ICON_NONE);
 +      uiItemR(layout, ptr, "blur_post", 0, NULL, ICON_NONE);
 +}
 +
  /* only once called */
  static void node_composit_set_butfunc(bNodeType *ntype)
  {

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

diff --cc source/blender/makesrna/RNA_access.h
Simple merge

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

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

diff --cc source/blender/nodes/CMakeLists.txt
Simple merge

diff --cc source/blenderplayer/CMakeLists.txt
Simple merge

diff --cc source/creator/CMakeLists.txt
Simple merge