Merging r46725 through r46963 from trunk into soc-2011-tomato
[blender.git] / source / blender / editors / space_node / drawnode.c
index db75198..fcc92ff 100644 (file)
@@ -2388,6 +2388,11 @@ static void node_composit_buts_viewer_but(uiLayout *layout, bContext *UNUSED(C),
        }
 }
 
+static void node_composit_buts_mask(uiLayout *layout, bContext *C, PointerRNA *ptr)
+{
+       uiTemplateID(layout, C, ptr, "mask", NULL, NULL, NULL);
+}
+
 /* only once called */
 static void node_composit_set_butfunc(bNodeType *ntype)
 {
@@ -2577,6 +2582,9 @@ static void node_composit_set_butfunc(bNodeType *ntype)
                        ntype->uifuncbut= node_composit_buts_viewer_but;
                        ntype->uibackdropfunc = node_composit_backdrop_viewer;
                        break;
+               case CMP_NODE_MASK:
+                       ntype->uifunc= node_composit_buts_mask;
+                       break;
 
                default:
                        ntype->uifunc= NULL;