Merging r46495 through r46557 from trunk into soc-2011-tomato
[blender-staging.git] / source / blender / editors / space_node / drawnode.c
index 205202a0658297a8dfbc24c62c3aa1b7bd7b0595..31fd3177406f8761bc70bf5576fc3f1f60c185d2 100644 (file)
@@ -1967,6 +1967,11 @@ static void node_composit_buts_moviedistortion(uiLayout *layout, bContext *C, Po
        uiItemR(layout, ptr, "distortion_type", 0, "", 0);
 }
 
+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)
 {
@@ -2134,6 +2139,9 @@ static void node_composit_set_butfunc(bNodeType *ntype)
                case CMP_NODE_MOVIEDISTORTION:
                        ntype->uifunc= node_composit_buts_moviedistortion;
                        break;
+               case CMP_NODE_MASK:
+                       ntype->uifunc= node_composit_buts_mask;
+                       break;
                default:
                        ntype->uifunc= NULL;
        }