svn merge ^/trunk/blender -r47150:47184
authorCampbell Barton <ideasman42@gmail.com>
Tue, 29 May 2012 15:02:21 +0000 (15:02 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 29 May 2012 15:02:21 +0000 (15:02 +0000)
14 files changed:
1  2 
source/blender/CMakeLists.txt
source/blender/blenkernel/BKE_node.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/node.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/space_node/drawnode.c
source/blender/editors/space_node/space_node.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_nodetree.c
source/blender/nodes/CMakeLists.txt
source/blenderplayer/CMakeLists.txt
source/creator/CMakeLists.txt

Simple merge
Simple merge
@@@ -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)
  {
Simple merge
Simple merge
Simple merge
Simple merge