2.5 Nodes:
[blender.git] / source / blender / editors / space_node / drawnode.c
index bf96d1c38aae2b344484f4989b94992cf4ee365d..403a8d1a5915a3f8c4f151bbba20dcc1f6f084e0 100644 (file)
@@ -22,7 +22,7 @@
  *
  * The Original Code is: all of this file.
  *
- * Contributor(s): David Millan Escriva, Juho Vepsäläinen
+ * Contributor(s): David Millan Escriva, Juho Vepsäläinen, Bob Holcomb, Thomas Dinges
  *
  * ***** END GPL LICENSE BLOCK *****
  */
@@ -71,8 +71,6 @@
 #include "BIF_gl.h"
 #include "BIF_glutil.h"
 
-#include "BMF_Api.h"
-
 #include "MEM_guardedalloc.h"
 
 #include "ED_node.h"
 #include "WM_types.h"
 
 #include "UI_view2d.h"
-#include "UI_text.h"
 #include "UI_interface.h"
 #include "UI_resources.h"
 
 #include "RE_pipeline.h"
+#include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 
 #include "node_intern.h"
 
-extern void autocomplete_uv(char *str, void *arg_v);
-// XXX extern int verify_valid_uv_name(char *str);
 
 /* autocomplete callback for buttons */
 static void autocomplete_vcol(bContext *C, char *str, void *arg_v)
@@ -152,16 +148,6 @@ static void node_ID_title_cb(bContext *C, void *node_v, void *unused_v)
        }
 }
 
-
-static void node_but_title_cb(bContext *C, void *node_v, void *but_v)
-{
-       // bNode *node= node_v;
-       // XXX uiBut *bt= but_v;
-       // XXX BLI_strncpy(node->name, bt->drawstr, NODE_MAXSTR);
-       
-       // allqueue(REDRAWNODE, 0);
-}
-
 #if 0
 /* XXX not used yet, make compiler happy :) */
 static void node_group_alone_cb(bContext *C, void *node_v, void *unused_v)
@@ -175,9 +161,13 @@ static void node_group_alone_cb(bContext *C, void *node_v, void *unused_v)
 
 /* ****************** BUTTON CALLBACKS FOR ALL TREES ***************** */
 
-static int node_buts_group(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+static void node_buts_group(uiLayout *layout, PointerRNA *ptr)
 {
-       if(block && node->id) {
+       uiBlock *block= uiLayoutAbsoluteBlock(layout);
+       bNode *node= ptr->data;
+       rctf *butr= &node->butr;
+
+       if(node->id) {
                uiBut *bt;
                short width;
                
@@ -202,112 +192,95 @@ static int node_buts_group(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *
                
                uiBlockEndAlign(block);
        }       
-       return 19;
 }
 #endif
 
-static int node_buts_value(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+static void node_buts_value(uiLayout *layout, PointerRNA *ptr)
 {
-       if(block) {
-               bNodeSocket *sock= node->outputs.first;         /* first socket stores value */
-               
-               uiDefButF(block, NUM, B_NODE_EXEC, "", 
-                                 (short)butr->xmin, (short)butr->ymin, butr->xmax-butr->xmin, 20, 
-                                 sock->ns.vec, sock->ns.min, sock->ns.max, 10, 2, "");
-               
-       }
-       return 20;
+       uiBlock *block= uiLayoutAbsoluteBlock(layout);
+       bNode *node= ptr->data;
+       rctf *butr= &node->butr;
+       bNodeSocket *sock= node->outputs.first;         /* first socket stores value */
+       
+       uiDefButF(block, NUM, B_NODE_EXEC, "", 
+                         (short)butr->xmin, (short)butr->ymin, butr->xmax-butr->xmin, 20, 
+                         sock->ns.vec, sock->ns.min, sock->ns.max, 10, 2, "");
 }
 
-static int node_buts_rgb(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+static void node_buts_rgb(uiLayout *layout, PointerRNA *ptr)
 {
-       if(block) {
-               bNodeSocket *sock= node->outputs.first;         /* first socket stores value */
-               if(sock) {
-                       /* enforce square box drawing */
-                       uiBlockSetEmboss(block, UI_EMBOSSP);
-                       
-                       uiDefButF(block, HSVCUBE, B_NODE_EXEC, "", 
-                                         (short)butr->xmin, (short)butr->ymin, butr->xmax-butr->xmin, 12, 
-                                         sock->ns.vec, 0.0f, 1.0f, 3, 0, "");
-                       uiDefButF(block, HSVCUBE, B_NODE_EXEC, "", 
-                                         (short)butr->xmin, (short)butr->ymin+15, butr->xmax-butr->xmin, butr->ymax-butr->ymin -15 -15, 
-                                         sock->ns.vec, 0.0f, 1.0f, 2, 0, "");
-                       uiDefButF(block, COL, B_NOP, "",                
-                                         (short)butr->xmin, (short)butr->ymax-12, butr->xmax-butr->xmin, 12, 
-                                         sock->ns.vec, 0.0, 0.0, -1, 0, "");
-                       /* the -1 above prevents col button to popup a color picker */
-                       
-                       uiBlockSetEmboss(block, UI_EMBOSS);
-               }
-       }
-       return 30 + (int)(node->width-NODE_DY);
-}
+       uiBlock *block= uiLayoutAbsoluteBlock(layout);
+       bNode *node= ptr->data;
+       rctf *butr= &node->butr;
+       bNodeSocket *sock= node->outputs.first;         /* first socket stores value */
 
-static int node_buts_mix_rgb(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
-{
-       if(block) {
-               uiBut *bt;
-               int a_but= (ntree->type==NTREE_COMPOSIT);
+       if(sock) {
+               /* enforce square box drawing */
+               uiBlockSetEmboss(block, UI_EMBOSSP);
                
-               /* blend type */
-               uiBlockBeginAlign(block);
-               bt=uiDefButS(block, MENU, B_NODE_EXEC, "Mix %x0|Add %x1|Subtract %x3|Multiply %x2|Screen %x4|Overlay %x9|Divide %x5|Difference %x6|Darken %x7|Lighten %x8|Dodge %x10|Burn %x11|Color %x15|Value %x14|Saturation %x13|Hue %x12",
-                                        (short)butr->xmin, (short)butr->ymin, butr->xmax-butr->xmin -(a_but?20:0), 20, 
-                                        &node->custom1, 0, 0, 0, 0, "");
-               uiButSetFunc(bt, node_but_title_cb, node, bt);
-               /* Alpha option, composite */
-               if(a_but)
-                       uiDefButS(block, TOG, B_NODE_EXEC, "A",
-                                 (short)butr->xmax-20, (short)butr->ymin, 20, 20, 
-                                 &node->custom2, 0, 0, 0, 0, "Include Alpha of 2nd input in this operation");
+               uiDefButF(block, HSVCUBE, B_NODE_EXEC, "", 
+                                 (short)butr->xmin, (short)butr->ymin, butr->xmax-butr->xmin, 12, 
+                                 sock->ns.vec, 0.0f, 1.0f, 3, 0, "");
+               uiDefButF(block, HSVCUBE, B_NODE_EXEC, "", 
+                                 (short)butr->xmin, (short)butr->ymin+15, butr->xmax-butr->xmin, butr->xmax-butr->xmin -15 -15, 
+                                 sock->ns.vec, 0.0f, 1.0f, 2, 0, "");
+               uiDefButF(block, COL, B_NOP, "",                
+                                 (short)butr->xmin, (short)butr->ymax-12, butr->xmax-butr->xmin, 12, 
+                                 sock->ns.vec, 0.0, 0.0, -1, 0, "");
+               /* the -1 above prevents col button to popup a color picker */
+               
+               uiBlockSetEmboss(block, UI_EMBOSS);
        }
-       return 20;
 }
 
-static int node_buts_time(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
-{
-       if(block) {
-               CurveMapping *cumap= node->storage;
-               short dx= (short)((butr->xmax-butr->xmin)/2);
-               butr->ymin += 26;
+static void node_buts_mix_rgb(uiLayout *layout, PointerRNA *ptr)
+{      
+       uiLayout *row;
 
-               curvemap_buttons(block, node->storage, 's', B_NODE_EXEC, B_REDR, butr);
-               
-               if(cumap) {
-                       //cumap->flag |= CUMA_DRAW_CFRA;
-                       //if(node->custom1<node->custom2)
-                       //      cumap->sample[0]= (float)(CFRA - node->custom1)/(float)(node->custom2-node->custom1);
-               }
+       bNodeTree *ntree= (bNodeTree*)ptr->id.data;
 
-               uiBlockBeginAlign(block);
-               uiDefButS(block, NUM, B_NODE_EXEC, "Sta:",
-                                 (short)butr->xmin, (short)butr->ymin-22, dx, 19, 
-                                 &node->custom1, 1.0, 20000.0, 0, 0, "Start frame");
-               uiDefButS(block, NUM, B_NODE_EXEC, "End:",
-                                 (short)butr->xmin+dx, (short)butr->ymin-22, dx, 19, 
-                                 &node->custom2, 1.0, 20000.0, 0, 0, "End frame");
-       }
+       row= uiLayoutRow(layout, 1);
+       uiItemR(row, "", 0, ptr, "blend_type", 0);
+       if(ntree->type == NTREE_COMPOSIT)
+               uiItemR(row, "", ICON_IMAGE_RGB_ALPHA, ptr, "alpha", 0);
+}
+
+static void node_buts_time(uiLayout *layout, PointerRNA *ptr)
+{
+       uiLayout *row;
+#if 0
+       /* XXX no context access here .. */
+       bNode *node= ptr->data;
+       CurveMapping *cumap= node->storage;
        
-       return node->width-NODE_DY;
+       if(cumap) {
+               cumap->flag |= CUMA_DRAW_CFRA;
+               if(node->custom1<node->custom2)
+                       cumap->sample[0]= (float)(CFRA - node->custom1)/(float)(node->custom2-node->custom1);
+       }
+#endif
+
+       uiTemplateCurveMapping(layout, ptr, "curve", 's', 0);
+
+       row= uiLayoutRow(layout, 1);
+       uiItemR(row, "Sta", 0, ptr, "start", 0);
+       uiItemR(row, "End", 0, ptr, "end", 0);
 }
 
-static int node_buts_valtorgb(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+static void node_buts_valtorgb(uiLayout *layout, PointerRNA *ptr)
 {
-       if(block) {
-               if(node->storage) {
-                       ; // XXX draw_colorband_buts_small(block, node->storage, butr, B_NODE_EXEC);
-               }
+       uiBlock *block= uiLayoutAbsoluteBlock(layout);
+       bNode *node= ptr->data;
+       rctf *butr= &node->butr;
+
+       if(node->storage) {
+               uiBlockColorbandButtons(block, node->storage, butr, B_NODE_EXEC);
        }
-       return 40;
 }
 
-static int node_buts_curvevec(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+static void node_buts_curvevec(uiLayout *layout, PointerRNA *ptr)
 {
-       if(block) {
-               curvemap_buttons(block, node->storage, 'v', B_NODE_EXEC, B_REDR, butr);
-       }       
-       return (int)(node->width-NODE_DY);
+       uiTemplateCurveMapping(layout, ptr, "mapping", 'v', 0);
 }
 
 static float *_sample_col= NULL;       // bad bad, 2.5 will do better?
@@ -316,33 +289,31 @@ void node_curvemap_sample(float *col)
        _sample_col= col;
 }
 
-static int node_buts_curvecol(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+static void node_buts_curvecol(uiLayout *layout, PointerRNA *ptr)
 {
-       if(block) {
-               CurveMapping *cumap= node->storage;
-               if(_sample_col) {
-                       cumap->flag |= CUMA_DRAW_SAMPLE;
-                       VECCOPY(cumap->sample, _sample_col);
-               }
-               else 
-                       cumap->flag &= ~CUMA_DRAW_SAMPLE;
+       bNode *node= ptr->data;
+       CurveMapping *cumap= node->storage;
 
-               curvemap_buttons(block, node->storage, 'c', B_NODE_EXEC, B_REDR, butr);
-       }       
-       return (int)(node->width-NODE_DY);
+       if(_sample_col) {
+               cumap->flag |= CUMA_DRAW_SAMPLE;
+               VECCOPY(cumap->sample, _sample_col);
+       }
+       else 
+               cumap->flag &= ~CUMA_DRAW_SAMPLE;
+
+       uiTemplateCurveMapping(layout, ptr, "mapping", 'c', 0);
 }
 
-static int node_buts_normal(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+static void node_buts_normal(uiLayout *layout, PointerRNA *ptr)
 {
-       if(block) {
-               bNodeSocket *sock= node->outputs.first;         /* first socket stores normal */
-               
-               uiDefButF(block, BUT_NORMAL, B_NODE_EXEC, "", 
-                                 (short)butr->xmin, (short)butr->ymin, butr->xmax-butr->xmin, butr->ymax-butr->ymin, 
-                                 sock->ns.vec, 0.0f, 1.0f, 0, 0, "");
-               
-       }       
-       return (int)(node->width-NODE_DY);
+       uiBlock *block= uiLayoutAbsoluteBlock(layout);
+       bNode *node= ptr->data;
+       rctf *butr= &node->butr;
+       bNodeSocket *sock= node->outputs.first;         /* first socket stores normal */
+       
+       uiDefButF(block, BUT_NORMAL, B_NODE_EXEC, "", 
+                         (short)butr->xmin, (short)butr->xmin, butr->xmax-butr->xmin, butr->xmax-butr->xmin, 
+                         sock->ns.vec, 0.0f, 1.0f, 0, 0, "");
 }
 
 static void node_browse_tex_cb(bContext *C, void *ntree_v, void *node_v)
@@ -406,8 +377,10 @@ static void node_dynamic_update_cb(bContext *C, void *ntree_v, void *node_v)
        // XXX BIF_preview_changed(ID_MA);
 }
 
-static int node_buts_texture(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+static void node_buts_texture(uiLayout *layout, PointerRNA *ptr)
 {
+       bNode *node= ptr->data;
+
        short multi = (
                node->id &&
                ((Tex*)node->id)->use_nodes &&
@@ -415,52 +388,19 @@ static int node_buts_texture(uiBlock *block, bNodeTree *ntree, bNode *node, rctf
                (node->type != TEX_NODE_TEXTURE)
        );
        
-       if(block) {
-               uiBut *bt;
-               char *strp;
-               short width = (short)(butr->xmax - butr->xmin);
-               
-               /* browse button texture */
-               uiBlockBeginAlign(block);
-               IDnames_to_pupstring(&strp, NULL, "", &(G.main->tex), NULL, NULL);
-               node->menunr= 0;
-               bt= uiDefButS(block, MENU, B_NODE_EXEC, strp, 
-                               butr->xmin, butr->ymin+(multi?30:0), 20, 19, 
-                                         &node->menunr, 0, 0, 0, 0, "Browse texture");
-               uiButSetFunc(bt, node_browse_tex_cb, ntree, node);
-               if(strp) MEM_freeN(strp);
-               
-               if(node->id) {
-                       bt= uiDefBut(block, TEX, B_NOP, "TE:",
-                                       butr->xmin+19, butr->ymin+(multi?30:0), butr->xmax-butr->xmin-19, 19, 
-                                                node->id->name+2, 0.0, 19.0, 0, 0, "Texture name");
-                       uiButSetFunc(bt, node_ID_title_cb, node, NULL);
-               }
-               uiBlockEndAlign(block);
-               
-               if(multi) {
-                       char *menustr = ntreeTexOutputMenu(((Tex*)node->id)->nodetree);
-                       uiDefButS(block, MENU, B_MATPRV, menustr, butr->xmin, butr->ymin, width, 19, &node->custom1, 0, 0, 0, 0, "Which output to use, for multi-output textures");
-                       free(menustr);
-                       return 50;
-               }
-               return 20;
-       }       
-       else return multi? 50: 20;
+       uiItemR(layout, "", 0, ptr, "texture", 0);
+       
+       if(multi) {
+               /* Number Drawing not optimal here, better have a list*/
+               uiItemR(layout, "", 0, ptr, "node_output", 0);
+       }
 }
 
-static int node_buts_math(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr) 
+static void node_buts_math(uiLayout *layout, PointerRNA *ptr)
 { 
-       if(block) { 
-               uiBut *bt; 
-
-               bt=uiDefButS(block, MENU, B_NODE_EXEC,  "Add %x0|Subtract %x1|Multiply %x2|Divide %x3|Sine %x4|Cosine %x5|Tangent %x6|Arcsine %x7|Arccosine %x8|Arctangent %x9|Power %x10|Logarithm %x11|Minimum %x12|Maximum %x13|Round %x14|Less Than %x15|Greater Than %x16", butr->xmin, butr->ymin, butr->xmax-butr->xmin, 20, &node->custom1, 0, 0, 0, 0, ""); 
-               uiButSetFunc(bt, node_but_title_cb, node, bt); 
-       } 
-       return 20; 
+       uiItemR(layout, "", 0, ptr, "operation", 0);
 }
 
-
 /* ****************** BUTTON CALLBACKS FOR SHADER NODES ***************** */
 
 static void node_browse_text_cb(bContext *C, void *ntree_v, void *node_v)
@@ -561,194 +501,186 @@ static void node_texmap_cb(bContext *C, void *texmap_v, void *unused_v)
        init_mapping(texmap_v);
 }
 
-static int node_shader_buts_material(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+static void node_shader_buts_material(uiLayout *layout, PointerRNA *ptr)
 {
-       if(block) {
-               uiBut *bt;
-               short dx= (short)((butr->xmax-butr->xmin)/3.0f), has_us= (node->id && node->id->us>1);
-               short dy= (short)butr->ymin;
-               char *strp;
-               
-               /* WATCH IT: we use this callback in material buttons, but then only want first row */
-               if(butr->ymax-butr->ymin > 21.0f) dy+= 19;
-               
-               uiBlockBeginAlign(block);
-               if(node->id==NULL) uiBlockSetCol(block, TH_REDALERT);
-               else if(has_us) uiBlockSetCol(block, TH_BUT_SETTING1);
-               else uiBlockSetCol(block, TH_BUT_SETTING2);
-               
-               /* browse button */
-               IDnames_to_pupstring(&strp, NULL, "ADD NEW %x32767", &(G.main->mat), NULL, NULL);
-               node->menunr= 0;
-               bt= uiDefButS(block, MENU, B_NOP, strp, 
-                                 butr->xmin, dy, 19, 19, 
-                                 &node->menunr, 0, 0, 0, 0, "Browses existing choices or adds NEW");
-               uiButSetFunc(bt, node_browse_mat_cb, ntree, node);
-               if(strp) MEM_freeN(strp);
+       uiBlock *block= uiLayoutAbsoluteBlock(layout);
+       bNode *node= ptr->data;
+       bNodeTree *ntree= ptr->id.data;
+       rctf *butr= &node->butr;
+       uiBut *bt;
+       short dx= (short)((butr->xmax-butr->xmin)/3.0f), has_us= (node->id && node->id->us>1);
+       short dy= (short)butr->ymin;
+       char *strp;
+       
+       /* WATCH IT: we use this callback in material buttons, but then only want first row */
+       if(butr->ymax-butr->ymin > 21.0f) dy+= 19;
+       
+       uiBlockBeginAlign(block);
+       /* XXX
+       if(node->id==NULL) uiBlockSetCol(block, TH_REDALERT);
+       else if(has_us) uiBlockSetCol(block, TH_BUT_SETTING1);
+       else uiBlockSetCol(block, TH_BUT_SETTING2);
+       */
+       
+       /* browse button */
+       IDnames_to_pupstring(&strp, NULL, "ADD NEW %x32767", &(G.main->mat), NULL, NULL);
+       node->menunr= 0;
+       bt= uiDefButS(block, MENU, B_NOP, strp, 
+                         butr->xmin, dy, 19, 19, 
+                         &node->menunr, 0, 0, 0, 0, "Browses existing choices or adds NEW");
+       uiButSetFunc(bt, node_browse_mat_cb, ntree, node);
+       if(strp) MEM_freeN(strp);
+       
+       /* Add New button */
+       if(node->id==NULL) {
+               bt= uiDefBut(block, BUT, B_NOP, "Add New",
+                                        butr->xmin+19, dy, (short)(butr->xmax-butr->xmin-19.0f), 19, 
+                                        NULL, 0.0, 0.0, 0, 0, "Add new Material");
+               uiButSetFunc(bt, node_new_mat_cb, ntree, node);
+       }
+       else {
+               /* name button */
+               short width= (short)(butr->xmax-butr->xmin-19.0f - (has_us?19.0f:0.0f));
+               bt= uiDefBut(block, TEX, B_NOP, "MA:",
+                                         butr->xmin+19, dy, width, 19, 
+                                         node->id->name+2, 0.0, 19.0, 0, 0, "Material name");
+               uiButSetFunc(bt, node_ID_title_cb, node, NULL);
                
-               /* Add New button */
-               if(node->id==NULL) {
-                       bt= uiDefBut(block, BUT, B_NOP, "Add New",
-                                                butr->xmin+19, dy, (short)(butr->xmax-butr->xmin-19.0f), 19, 
-                                                NULL, 0.0, 0.0, 0, 0, "Add new Material");
-                       uiButSetFunc(bt, node_new_mat_cb, ntree, node);
-                       uiBlockSetCol(block, TH_AUTO);
+               /* user amount */
+               if(has_us) {
+                       char str1[32];
+                       sprintf(str1, "%d", node->id->us);
+                       bt= uiDefBut(block, BUT, B_NOP, str1, 
+                                                 butr->xmax-19, dy, 19, 19, 
+                                                 NULL, 0, 0, 0, 0, "Displays number of users. Click to make a single-user copy.");
+                       uiButSetFunc(bt, node_mat_alone_cb, node, NULL);
                }
-               else {
-                       /* name button */
-                       short width= (short)(butr->xmax-butr->xmin-19.0f - (has_us?19.0f:0.0f));
-                       bt= uiDefBut(block, TEX, B_NOP, "MA:",
-                                                 butr->xmin+19, dy, width, 19, 
-                                                 node->id->name+2, 0.0, 19.0, 0, 0, "Material name");
-                       uiButSetFunc(bt, node_ID_title_cb, node, NULL);
-                       
-                       /* user amount */
-                       if(has_us) {
-                               char str1[32];
-                               sprintf(str1, "%d", node->id->us);
-                               bt= uiDefBut(block, BUT, B_NOP, str1, 
-                                                         butr->xmax-19, dy, 19, 19, 
-                                                         NULL, 0, 0, 0, 0, "Displays number of users. Click to make a single-user copy.");
-                               uiButSetFunc(bt, node_mat_alone_cb, node, NULL);
-                       }
-                       
-                       /* WATCH IT: we use this callback in material buttons, but then only want first row */
-                       if(butr->ymax-butr->ymin > 21.0f) {
-                               /* node options */
-                               uiBlockSetCol(block, TH_AUTO);
-                               uiDefButBitS(block, TOG, SH_NODE_MAT_DIFF, B_NODE_EXEC, "Diff",
-                                                        butr->xmin, butr->ymin, dx, 19, 
-                                                        &node->custom1, 0, 0, 0, 0, "Material Node outputs Diffuse");
-                               uiDefButBitS(block, TOG, SH_NODE_MAT_SPEC, B_NODE_EXEC, "Spec",
-                                                        butr->xmin+dx, butr->ymin, dx, 19, 
-                                                        &node->custom1, 0, 0, 0, 0, "Material Node outputs Specular");
-                               uiDefButBitS(block, TOG, SH_NODE_MAT_NEG, B_NODE_EXEC, "Neg Normal",
-                                                        butr->xmax-dx, butr->ymin, dx, 19,
-                                                        &node->custom1, 0, 0, 0, 0, "Material Node uses inverted Normal");
-                       }
+               
+               /* WATCH IT: we use this callback in material buttons, but then only want first row */
+               if(butr->ymax-butr->ymin > 21.0f) {
+                       /* node options */
+                       uiDefButBitS(block, TOG, SH_NODE_MAT_DIFF, B_NODE_EXEC, "Diff",
+                                                butr->xmin, butr->ymin, dx, 19, 
+                                                &node->custom1, 0, 0, 0, 0, "Material Node outputs Diffuse");
+                       uiDefButBitS(block, TOG, SH_NODE_MAT_SPEC, B_NODE_EXEC, "Spec",
+                                                butr->xmin+dx, butr->ymin, dx, 19, 
+                                                &node->custom1, 0, 0, 0, 0, "Material Node outputs Specular");
+                       uiDefButBitS(block, TOG, SH_NODE_MAT_NEG, B_NODE_EXEC, "Neg Normal",
+                                                butr->xmax-dx, butr->ymin, dx, 19,
+                                                &node->custom1, 0, 0, 0, 0, "Material Node uses inverted Normal");
                }
-               uiBlockEndAlign(block);
-       }       
-       return 38;
+       }
+       uiBlockEndAlign(block);
 }
 
-static int node_shader_buts_mapping(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+static void node_shader_buts_mapping(uiLayout *layout, PointerRNA *ptr)
 {
-       if(block) {
-               TexMapping *texmap= node->storage;
-               short dx= (short)((butr->xmax-butr->xmin)/7.0f);
-               short dy= (short)(butr->ymax-19);
-               
-               uiBlockSetFunc(block, node_texmap_cb, texmap, NULL);    /* all buttons get this */
-               
-               uiBlockBeginAlign(block);
-               uiDefButF(block, NUM, B_NODE_EXEC, "", butr->xmin+dx, dy, 2*dx, 19, texmap->loc, -1000.0f, 1000.0f, 10, 2, "");
-               uiDefButF(block, NUM, B_NODE_EXEC, "", butr->xmin+3*dx, dy, 2*dx, 19, texmap->loc+1, -1000.0f, 1000.0f, 10, 2, "");
-               uiDefButF(block, NUM, B_NODE_EXEC, "", butr->xmin+5*dx, dy, 2*dx, 19, texmap->loc+2, -1000.0f, 1000.0f, 10, 2, "");
-               dy-= 19;
-               uiDefButF(block, NUM, B_NODE_EXEC, "", butr->xmin+dx, dy, 2*dx, 19, texmap->rot, -1000.0f, 1000.0f, 1000, 1, "");
-               uiDefButF(block, NUM, B_NODE_EXEC, "", butr->xmin+3*dx, dy, 2*dx, 19, texmap->rot+1, -1000.0f, 1000.0f, 1000, 1, "");
-               uiDefButF(block, NUM, B_NODE_EXEC, "", butr->xmin+5*dx, dy, 2*dx, 19, texmap->rot+2, -1000.0f, 1000.0f, 1000, 1, "");
-               dy-= 19;
-               uiDefButF(block, NUM, B_NODE_EXEC, "", butr->xmin+dx, dy, 2*dx, 19, texmap->size, -1000.0f, 1000.0f, 10, 2, "");
-               uiDefButF(block, NUM, B_NODE_EXEC, "", butr->xmin+3*dx, dy, 2*dx, 19, texmap->size+1, -1000.0f, 1000.0f, 10, 2, "");
-               uiDefButF(block, NUM, B_NODE_EXEC, "", butr->xmin+5*dx, dy, 2*dx, 19, texmap->size+2, -1000.0f, 1000.0f, 10, 2, "");
-               dy-= 25;
-               uiBlockBeginAlign(block);
-               uiDefButF(block, NUM, B_NODE_EXEC, "", butr->xmin+dx, dy, 2*dx, 19, texmap->min, -10.0f, 10.0f, 100, 2, "");
-               uiDefButF(block, NUM, B_NODE_EXEC, "", butr->xmin+3*dx, dy, 2*dx, 19, texmap->min+1, -10.0f, 10.0f, 100, 2, "");
-               uiDefButF(block, NUM, B_NODE_EXEC, "", butr->xmin+5*dx, dy, 2*dx, 19, texmap->min+2, -10.0f, 10.0f, 100, 2, "");
-               dy-= 19;
-               uiDefButF(block, NUM, B_NODE_EXEC, "", butr->xmin+dx, dy, 2*dx, 19, texmap->max, -10.0f, 10.0f, 10, 2, "");
-               uiDefButF(block, NUM, B_NODE_EXEC, "", butr->xmin+3*dx, dy, 2*dx, 19, texmap->max+1, -10.0f, 10.0f, 10, 2, "");
-               uiDefButF(block, NUM, B_NODE_EXEC, "", butr->xmin+5*dx, dy, 2*dx, 19, texmap->max+2, -10.0f, 10.0f, 10, 2, "");
-               uiBlockEndAlign(block);
-               
-               /* labels/options */
-               
-               dy= (short)(butr->ymax-19);
-               uiDefBut(block, LABEL, B_NOP, "Loc", butr->xmin, dy, dx, 19, NULL, 0.0f, 0.0f, 0, 0, "");
-               dy-= 19;
-               uiDefBut(block, LABEL, B_NOP, "Rot", butr->xmin, dy, dx, 19, NULL, 0.0f, 0.0f, 0, 0, "");
-               dy-= 19;
-               uiDefBut(block, LABEL, B_NOP, "Size", butr->xmin, dy, dx, 19, NULL, 0.0f, 0.0f, 0, 0, "");
-               dy-= 25;
-               uiDefButBitI(block, TOG, TEXMAP_CLIP_MIN, B_NODE_EXEC, "Min", butr->xmin, dy, dx-4, 19, &texmap->flag, 0.0f, 0.0f, 0, 0, "");
-               dy-= 19;
-               uiDefButBitI(block, TOG, TEXMAP_CLIP_MAX, B_NODE_EXEC, "Max", butr->xmin, dy, dx-4, 19, &texmap->flag, 0.0f, 0.0f, 0, 0, "");
-               
-       }       
-       return 5*19 + 6;
+       uiBlock *block= uiLayoutAbsoluteBlock(layout);
+       bNode *node= ptr->data;
+       rctf *butr= &node->butr;
+       TexMapping *texmap= node->storage;
+       short dx= (short)((butr->xmax-butr->xmin)/7.0f);
+       short dy= (short)(butr->ymax-19);
+       
+       uiBlockSetFunc(block, node_texmap_cb, texmap, NULL);    /* all buttons get this */
+       
+       uiBlockBeginAlign(block);
+       uiDefButF(block, NUM, B_NODE_EXEC, "", butr->xmin+dx, dy, 2*dx, 19, texmap->loc, -1000.0f, 1000.0f, 10, 2, "");
+       uiDefButF(block, NUM, B_NODE_EXEC, "", butr->xmin+3*dx, dy, 2*dx, 19, texmap->loc+1, -1000.0f, 1000.0f, 10, 2, "");
+       uiDefButF(block, NUM, B_NODE_EXEC, "", butr->xmin+5*dx, dy, 2*dx, 19, texmap->loc+2, -1000.0f, 1000.0f, 10, 2, "");
+       dy-= 19;
+       uiDefButF(block, NUM, B_NODE_EXEC, "", butr->xmin+dx, dy, 2*dx, 19, texmap->rot, -1000.0f, 1000.0f, 1000, 1, "");
+       uiDefButF(block, NUM, B_NODE_EXEC, "", butr->xmin+3*dx, dy, 2*dx, 19, texmap->rot+1, -1000.0f, 1000.0f, 1000, 1, "");
+       uiDefButF(block, NUM, B_NODE_EXEC, "", butr->xmin+5*dx, dy, 2*dx, 19, texmap->rot+2, -1000.0f, 1000.0f, 1000, 1, "");
+       dy-= 19;
+       uiDefButF(block, NUM, B_NODE_EXEC, "", butr->xmin+dx, dy, 2*dx, 19, texmap->size, -1000.0f, 1000.0f, 10, 2, "");
+       uiDefButF(block, NUM, B_NODE_EXEC, "", butr->xmin+3*dx, dy, 2*dx, 19, texmap->size+1, -1000.0f, 1000.0f, 10, 2, "");
+       uiDefButF(block, NUM, B_NODE_EXEC, "", butr->xmin+5*dx, dy, 2*dx, 19, texmap->size+2, -1000.0f, 1000.0f, 10, 2, "");
+       dy-= 25;
+       uiBlockBeginAlign(block);
+       uiDefButF(block, NUM, B_NODE_EXEC, "", butr->xmin+dx, dy, 2*dx, 19, texmap->min, -10.0f, 10.0f, 100, 2, "");
+       uiDefButF(block, NUM, B_NODE_EXEC, "", butr->xmin+3*dx, dy, 2*dx, 19, texmap->min+1, -10.0f, 10.0f, 100, 2, "");
+       uiDefButF(block, NUM, B_NODE_EXEC, "", butr->xmin+5*dx, dy, 2*dx, 19, texmap->min+2, -10.0f, 10.0f, 100, 2, "");
+       dy-= 19;
+       uiDefButF(block, NUM, B_NODE_EXEC, "", butr->xmin+dx, dy, 2*dx, 19, texmap->max, -10.0f, 10.0f, 10, 2, "");
+       uiDefButF(block, NUM, B_NODE_EXEC, "", butr->xmin+3*dx, dy, 2*dx, 19, texmap->max+1, -10.0f, 10.0f, 10, 2, "");
+       uiDefButF(block, NUM, B_NODE_EXEC, "", butr->xmin+5*dx, dy, 2*dx, 19, texmap->max+2, -10.0f, 10.0f, 10, 2, "");
+       uiBlockEndAlign(block);
+       
+       /* labels/options */
+       
+       dy= (short)(butr->ymax-19);
+       uiDefBut(block, LABEL, B_NOP, "Loc", butr->xmin, dy, dx, 19, NULL, 0.0f, 0.0f, 0, 0, "");
+       dy-= 19;
+       uiDefBut(block, LABEL, B_NOP, "Rot", butr->xmin, dy, dx, 19, NULL, 0.0f, 0.0f, 0, 0, "");
+       dy-= 19;
+       uiDefBut(block, LABEL, B_NOP, "Size", butr->xmin, dy, dx, 19, NULL, 0.0f, 0.0f, 0, 0, "");
+       dy-= 25;
+       uiDefButBitI(block, TOG, TEXMAP_CLIP_MIN, B_NODE_EXEC, "Min", butr->xmin, dy, dx-4, 19, &texmap->flag, 0.0f, 0.0f, 0, 0, "");
+       dy-= 19;
+       uiDefButBitI(block, TOG, TEXMAP_CLIP_MAX, B_NODE_EXEC, "Max", butr->xmin, dy, dx-4, 19, &texmap->flag, 0.0f, 0.0f, 0, 0, "");
 }
 
-static int node_shader_buts_vect_math(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr) 
+static void node_shader_buts_vect_math(uiLayout *layout, PointerRNA *ptr)
 { 
-       if(block) { 
-               uiBut *bt; 
-       
-               bt=uiDefButS(block, MENU, B_NODE_EXEC,  "Add %x0|Subtract %x1|Average %x2|Dot Product %x3 |Cross Product %x4|Normalize %x5", butr->xmin, butr->ymin, butr->xmax-butr->xmin, 20, &node->custom1, 0, 0, 0, 0, ""); 
-               uiButSetFunc(bt, node_but_title_cb, node, bt); 
-       } 
-       return 20; 
+       uiItemR(layout, "", 0, ptr, "operation", 0);
 }
 
-static int node_shader_buts_geometry(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+static void node_shader_buts_geometry(uiLayout *layout, PointerRNA *ptr)
 {
-       if(block) {
-               uiBut *but;
-               NodeGeometry *ngeo= (NodeGeometry*)node->storage;
-
-               // XXX if(!verify_valid_uv_name(ngeo->uvname))
-               // XXX  uiBlockSetCol(block, TH_REDALERT);
-               but= uiDefBut(block, TEX, B_NODE_EXEC, "UV:", butr->xmin, butr->ymin+20, butr->xmax-butr->xmin, 20, ngeo->uvname, 0, 31, 0, 0, "Set name of UV layer to use, default is active UV layer");
-               // uiButSetCompleteFunc(but, autocomplete_uv, NULL);
-               uiBlockSetCol(block, TH_AUTO);
+       uiBlock *block= uiLayoutAbsoluteBlock(layout);
+       bNode *node= ptr->data;
+       rctf *butr= &node->butr;
+       uiBut *but;
+       NodeGeometry *ngeo= (NodeGeometry*)node->storage;
 
-               if(!verify_valid_vcol_name(ngeo->colname))
-                       uiBlockSetCol(block, TH_REDALERT);
-               but= uiDefBut(block, TEX, B_NODE_EXEC, "Col:", butr->xmin, butr->ymin, butr->xmax-butr->xmin, 20, ngeo->colname, 0, 31, 0, 0, "Set name of vertex color layer to use, default is active vertex color layer");
-               uiButSetCompleteFunc(but, autocomplete_vcol, NULL);
-               uiBlockSetCol(block, TH_AUTO);
-       }
+       // XXX if(!verify_valid_uv_name(ngeo->uvname))
+       // XXX  uiBlockSetCol(block, TH_REDALERT);
+       but= uiDefBut(block, TEX, B_NODE_EXEC, "UV:", butr->xmin, butr->ymin+20, butr->xmax-butr->xmin, 20, ngeo->uvname, 0, 31, 0, 0, "Set name of UV layer to use, default is active UV layer");
+       // XXX uiButSetCompleteFunc(but, autocomplete_uv, NULL);
 
-       return 40;
+       if(!verify_valid_vcol_name(ngeo->colname));
+//                     uiBlockSetCol(block, TH_REDALERT);
+       but= uiDefBut(block, TEX, B_NODE_EXEC, "Col:", butr->xmin, butr->ymin, butr->xmax-butr->xmin, 20, ngeo->colname, 0, 31, 0, 0, "Set name of vertex color layer to use, default is active vertex color layer");
+       uiButSetCompleteFunc(but, autocomplete_vcol, NULL);
 }
 
-static int node_shader_buts_dynamic(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr) 
+static void node_shader_buts_dynamic(uiLayout *layout, PointerRNA *ptr)
 { 
-       if (block) { 
-               uiBut *bt;
-               // XXX SpaceNode *snode= curarea->spacedata.first;
-               short dy= (short)butr->ymin;
-               int xoff=0;
-
-               /* B_NODE_EXEC is handled in butspace.c do_node_buts */
-               if(!node->id) {
-                               char *strp;
-                               IDnames_to_pupstring(&strp, NULL, "", &(G.main->text), NULL, NULL);
-                               node->menunr= 0;
-                               bt= uiDefButS(block, MENU, B_NODE_EXEC/*+node->nr*/, strp, 
-                                                               butr->xmin, dy, 19, 19, 
-                                                               &node->menunr, 0, 0, 0, 0, "Browses existing choices");
-                               uiButSetFunc(bt, node_browse_text_cb, ntree, node);
-                               xoff=19;
-                               if(strp) MEM_freeN(strp);       
-               }
-               else {
-                       bt = uiDefBut(block, BUT, B_NOP, "Update",
-                                       butr->xmin+xoff, butr->ymin+20, 50, 19,
-                                       &node->menunr, 0.0, 19.0, 0, 0, "Refresh this node (and all others that use the same script)");
-                       uiButSetFunc(bt, node_dynamic_update_cb, ntree, node);
-
-                       if (BTST(node->custom1, NODE_DYNAMIC_ERROR)) {
-                               // UI_ThemeColor(TH_REDALERT);
-                               // XXX ui_rasterpos_safe(butr->xmin + xoff, butr->ymin + 5, snode->aspect);
-                               // XXX snode_drawstring(snode, "Error! Check console...", butr->xmax - butr->xmin);
-                               ;
-                       }
+       uiBlock *block= uiLayoutAbsoluteBlock(layout);
+       bNode *node= ptr->data;
+       bNodeTree *ntree= ptr->id.data;
+       rctf *butr= &node->butr;
+       uiBut *bt;
+       // XXX SpaceNode *snode= curarea->spacedata.first;
+       short dy= (short)butr->ymin;
+       int xoff=0;
+
+       /* B_NODE_EXEC is handled in butspace.c do_node_buts */
+       if(!node->id) {
+                       char *strp;
+                       IDnames_to_pupstring(&strp, NULL, "", &(G.main->text), NULL, NULL);
+                       node->menunr= 0;
+                       bt= uiDefButS(block, MENU, B_NODE_EXEC/*+node->nr*/, strp, 
+                                                       butr->xmin, dy, 19, 19, 
+                                                       &node->menunr, 0, 0, 0, 0, "Browses existing choices");
+                       uiButSetFunc(bt, node_browse_text_cb, ntree, node);
+                       xoff=19;
+                       if(strp) MEM_freeN(strp);       
+       }
+       else {
+               bt = uiDefBut(block, BUT, B_NOP, "Update",
+                               butr->xmin+xoff, butr->ymin+20, 50, 19,
+                               &node->menunr, 0.0, 19.0, 0, 0, "Refresh this node (and all others that use the same script)");
+               uiButSetFunc(bt, node_dynamic_update_cb, ntree, node);
+
+               if (BTST(node->custom1, NODE_DYNAMIC_ERROR)) {
+                       // UI_ThemeColor(TH_REDALERT);
+                       // XXX ui_rasterpos_safe(butr->xmin + xoff, butr->ymin + 5, snode->aspect);
+                       // XXX snode_drawstring(snode, "Error! Check console...", butr->xmax - butr->xmin);
+                       ;
                }
        }
-       return 20+19; 
 }
 
 /* only once called */
@@ -759,56 +691,54 @@ static void node_shader_set_butfunc(bNodeType *ntype)
 
                case SH_NODE_MATERIAL:
                case SH_NODE_MATERIAL_EXT:
-                       ntype->butfunc= node_shader_buts_material;
+                       ntype->uifunc= node_shader_buts_material;
                        break;
                case SH_NODE_TEXTURE:
-                       ntype->butfunc= node_buts_texture;
+                       ntype->uifunc= node_buts_texture;
                        break;
                case SH_NODE_NORMAL:
-                       ntype->butfunc= node_buts_normal;
+                       ntype->uifunc= node_buts_normal;
                        break;
                case SH_NODE_CURVE_VEC:
-                       ntype->butfunc= node_buts_curvevec;
+                       ntype->uifunc= node_buts_curvevec;
                        break;
                case SH_NODE_CURVE_RGB:
-                       ntype->butfunc= node_buts_curvecol;
+                       ntype->uifunc= node_buts_curvecol;
                        break;
                case SH_NODE_MAPPING:
-                       ntype->butfunc= node_shader_buts_mapping;
+                       ntype->uifunc= node_shader_buts_mapping;
                        break;
                case SH_NODE_VALUE:
-                       ntype->butfunc= node_buts_value;
+                       ntype->uifunc= node_buts_value;
                        break;
                case SH_NODE_RGB:
-                       ntype->butfunc= node_buts_rgb;
+                       ntype->uifunc= node_buts_rgb;
                        break;
                case SH_NODE_MIX_RGB:
-                       ntype->butfunc= node_buts_mix_rgb;
+                       ntype->uifunc= node_buts_mix_rgb;
                        break;
                case SH_NODE_VALTORGB:
-                       ntype->butfunc= node_buts_valtorgb;
+                       ntype->uifunc= node_buts_valtorgb;
                        break;
                case SH_NODE_MATH: 
-                       ntype->butfunc= node_buts_math;
+                       ntype->uifunc= node_buts_math;
                        break; 
                case SH_NODE_VECT_MATH: 
-                       ntype->butfunc= node_shader_buts_vect_math;
+                       ntype->uifunc= node_shader_buts_vect_math;
                        break; 
                case SH_NODE_GEOMETRY:
-                       ntype->butfunc= node_shader_buts_geometry;
+                       ntype->uifunc= node_shader_buts_geometry;
                        break;
                case NODE_DYNAMIC:
-                       ntype->butfunc= node_shader_buts_dynamic;
+                       ntype->uifunc= node_shader_buts_dynamic;
                        break;
                default:
-                       ntype->butfunc= NULL;
+                       ntype->uifunc= NULL;
        }
 }
 
 /* ****************** BUTTON CALLBACKS FOR COMPOSITE NODES ***************** */
 
-
-
 static void node_browse_image_cb(bContext *C, void *ntree_v, void *node_v)
 {
        bNodeTree *ntree= ntree_v;
@@ -886,114 +816,102 @@ static void image_layer_cb(bContext *C, void *ima_v, void *iuser_v)
        // allqueue(REDRAWNODE, 0);
 }
 
-static int node_composit_buts_image(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+static void node_composit_buts_image(uiLayout *layout, PointerRNA *ptr)
 {
+       uiBlock *block= uiLayoutAbsoluteBlock(layout);
+       bNode *node= ptr->data;
+       bNodeTree *ntree= ptr->id.data;
+       rctf *butr= &node->butr;
        ImageUser *iuser= node->storage;
+       uiBut *bt;
+       short dy= (short)butr->ymax-19;
+       char *strp;
        
-       if(block) {
-               uiBut *bt;
-               short dy= (short)butr->ymax-19;
-               char *strp;
+       uiBlockBeginAlign(block);
+       
+       /* browse button */
+       IMAnames_to_pupstring(&strp, NULL, "LOAD NEW %x32767", &(G.main->image), NULL, NULL);
+       node->menunr= 0;
+       bt= uiDefButS(block, MENU, B_NOP, strp, 
+                                 butr->xmin, dy, 19, 19, 
+                                 &node->menunr, 0, 0, 0, 0, "Browses existing choices");
+       uiButSetFunc(bt, node_browse_image_cb, ntree, node);
+       if(strp) MEM_freeN(strp);
+       
+       /* Add New button */
+       if(node->id==NULL) {
+               bt= uiDefBut(block, BUT, B_NODE_LOADIMAGE, "Load New",
+                                        butr->xmin+19, dy, (short)(butr->xmax-butr->xmin-19.0f), 19, 
+                                        NULL, 0.0, 0.0, 0, 0, "Add new Image");
+               uiButSetFunc(bt, node_active_cb, ntree, node);
+       }
+       else {
+               /* name button + type */
+               Image *ima= (Image *)node->id;
+               short xmin= (short)butr->xmin, xmax= (short)butr->xmax;
+               short width= xmax - xmin - 45;
+               short icon= ICON_IMAGE_DATA;
                
-               uiBlockBeginAlign(block);
-               uiBlockSetCol(block, TH_BUT_SETTING2);
+               if(ima->source==IMA_SRC_MOVIE) icon= ICON_SEQUENCE;
+               else if(ima->source==IMA_SRC_SEQUENCE) icon= ICON_IMAGE_COL;
+               else if(ima->source==IMA_SRC_GENERATED) icon= ICON_BLANK1;
                
-               /* browse button */
-               IMAnames_to_pupstring(&strp, NULL, "LOAD NEW %x32767", &(G.main->image), NULL, NULL);
-               node->menunr= 0;
-               bt= uiDefButS(block, MENU, B_NOP, strp, 
-                                         butr->xmin, dy, 19, 19, 
-                                         &node->menunr, 0, 0, 0, 0, "Browses existing choices");
-               uiButSetFunc(bt, node_browse_image_cb, ntree, node);
-               if(strp) MEM_freeN(strp);
+               bt= uiDefBut(block, TEX, B_NOP, "IM:",
+                                        xmin+19, dy, width, 19, 
+                                        node->id->name+2, 0.0, 19.0, 0, 0, "Image name");
+               uiButSetFunc(bt, node_ID_title_cb, node, NULL);
                
-               /* Add New button */
-               if(node->id==NULL) {
-                       bt= uiDefBut(block, BUT, B_NODE_LOADIMAGE, "Load New",
-                                                butr->xmin+19, dy, (short)(butr->xmax-butr->xmin-19.0f), 19, 
-                                                NULL, 0.0, 0.0, 0, 0, "Add new Image");
-                       uiButSetFunc(bt, node_active_cb, ntree, node);
-                       uiBlockSetCol(block, TH_AUTO);
-               }
-               else {
-                       /* name button + type */
-                       Image *ima= (Image *)node->id;
-                       short xmin= (short)butr->xmin, xmax= (short)butr->xmax;
-                       short width= xmax - xmin - 45;
-                       short icon= ICON_IMAGE_DATA;
-                       
-                       if(ima->source==IMA_SRC_MOVIE) icon= ICON_SEQUENCE;
-                       else if(ima->source==IMA_SRC_SEQUENCE) icon= ICON_IMAGE_COL;
-                       else if(ima->source==IMA_SRC_GENERATED) icon= ICON_BLANK1;
-                       
-                       bt= uiDefBut(block, TEX, B_NOP, "IM:",
-                                                xmin+19, dy, width, 19, 
-                                                node->id->name+2, 0.0, 19.0, 0, 0, "Image name");
-                       uiButSetFunc(bt, node_ID_title_cb, node, NULL);
-                       
-                       /* buffer type option */
-                       strp= node_image_type_pup();
-                       bt= uiDefIconTextButS(block, MENU, B_NOP, icon, strp,
-                                                xmax-26, dy, 26, 19, 
-                                                &ima->source, 0.0, 19.0, 0, 0, "Image type");
-                       uiButSetFunc(bt, node_image_type_cb, node, ima);
-                       MEM_freeN(strp);
+               /* buffer type option */
+               strp= node_image_type_pup();
+               bt= uiDefIconTextButS(block, MENU, B_NOP, icon, strp,
+                                        xmax-26, dy, 26, 19, 
+                                        &ima->source, 0.0, 19.0, 0, 0, "Image type");
+               uiButSetFunc(bt, node_image_type_cb, node, ima);
+               MEM_freeN(strp);
+               
+               if( ELEM(ima->source, IMA_SRC_MOVIE, IMA_SRC_SEQUENCE) ) {
+                       width= (xmax-xmin)/2;
                        
-                       if( ELEM(ima->source, IMA_SRC_MOVIE, IMA_SRC_SEQUENCE) ) {
-                               width= (xmax-xmin)/2;
-                               
-                               dy-= 19;
-                               uiDefButI(block, NUM, B_NODE_EXEC, "Frs:",
-                                                 xmin, dy, width, 19, 
-                                                 &iuser->frames, 1.0, MAXFRAMEF, 0, 0, "Amount of images used in animation");
-                               uiDefButI(block, NUM, B_NODE_EXEC, "SFra:",
-                                                 xmin+width, dy, width, 19, 
-                                                 &iuser->sfra, 1.0, MAXFRAMEF, 0, 0, "Start frame of animation");
+                       dy-= 19;
+                       uiDefButI(block, NUM, B_NODE_EXEC, "Frs:",
+                                         xmin, dy, width, 19, 
+                                         &iuser->frames, 1.0, MAXFRAMEF, 0, 0, "Amount of images used in animation");
+                       uiDefButI(block, NUM, B_NODE_EXEC, "SFra:",
+                                         xmin+width, dy, width, 19, 
+                                         &iuser->sfra, 1.0, MAXFRAMEF, 0, 0, "Start frame of animation");
+                       dy-= 19;
+                       uiDefButI(block, NUM, B_NODE_EXEC, "Offs:",
+                                         xmin, dy, width, 19, 
+                                         &iuser->offset, -MAXFRAMEF, MAXFRAMEF, 0, 0, "Offsets the number of the frame to use in the animation");
+                       uiDefButS(block, TOG, B_NODE_EXEC, "Cycl",
+                                         xmin+width, dy, width-20, 19, 
+                                         &iuser->cycl, 0.0, 0.0, 0, 0, "Make animation go cyclic");
+                       uiDefIconButBitS(block, TOG, IMA_ANIM_ALWAYS, B_NODE_EXEC, ICON_AUTO,
+                                         xmax-20, dy, 20, 19, 
+                                         &iuser->flag, 0.0, 0.0, 0, 0, "Always refresh Image on frame changes");
+               }
+               if( ima->type==IMA_TYPE_MULTILAYER && ima->rr) {
+                       RenderLayer *rl= BLI_findlink(&ima->rr->layers, iuser->layer);
+                       if(rl) {
+                               width= (xmax-xmin);
                                dy-= 19;
-                               uiDefButI(block, NUM, B_NODE_EXEC, "Offs:",
+                               strp= layer_menu(ima->rr);
+                               bt= uiDefButS(block, MENU, B_NODE_EXEC, strp,
                                                  xmin, dy, width, 19, 
-                                                 &iuser->offset, -MAXFRAMEF, MAXFRAMEF, 0, 0, "Offsets the number of the frame to use in the animation");
-                               uiDefButS(block, TOG, B_NODE_EXEC, "Cycl",
-                                                 xmin+width, dy, width-20, 19, 
-                                                 &iuser->cycl, 0.0, 0.0, 0, 0, "Make animation go cyclic");
-                               uiDefIconButBitS(block, TOG, IMA_ANIM_ALWAYS, B_NODE_EXEC, ICON_AUTO,
-                                                 xmax-20, dy, 20, 19, 
-                                                 &iuser->flag, 0.0, 0.0, 0, 0, "Always refresh Image on frame changes");
-                       }
-                       if( ima->type==IMA_TYPE_MULTILAYER && ima->rr) {
-                               RenderLayer *rl= BLI_findlink(&ima->rr->layers, iuser->layer);
-                               if(rl) {
-                                       width= (xmax-xmin);
-                                       dy-= 19;
-                                       strp= layer_menu(ima->rr);
-                                       bt= uiDefButS(block, MENU, B_NODE_EXEC, strp,
-                                                         xmin, dy, width, 19, 
-                                                         &iuser->layer, 0.0, 10000.0, 0, 0, "Layer");
-                                       uiButSetFunc(bt, image_layer_cb, ima->rr, node->storage);
-                                       MEM_freeN(strp);
-                               }
+                                                 &iuser->layer, 0.0, 10000.0, 0, 0, "Layer");
+                               uiButSetFunc(bt, image_layer_cb, ima->rr, node->storage);
+                               MEM_freeN(strp);
                        }
                }
+       }
                
-       }       
        if(node->id) {
-               Image *ima= (Image *)node->id;
-               int retval= 19;
-               
                /* for each draw we test for anim refresh event */
                if(iuser->flag & IMA_ANIM_REFRESHED) {
                        iuser->flag &= ~IMA_ANIM_REFRESHED;
                        // addqueue(curarea->win, UI_BUT_EVENT, B_NODE_EXEC); XXX
                }
-               
-               if( ELEM(ima->source, IMA_SRC_MOVIE, IMA_SRC_SEQUENCE) )
-                       retval+= 38;
-               if( ima->type==IMA_TYPE_MULTILAYER)
-                       retval+= 19;
-               return retval;
        }
-       else
-               return 19;
 }
 
 /* if we use render layers from other scene, we make a nice title */
@@ -1066,9 +984,14 @@ static void node_browse_scene_cb(bContext *C, void *ntree_v, void *node_v)
 }
 
 
-static int node_composit_buts_renderlayers(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+static void node_composit_buts_renderlayers(uiLayout *layout, PointerRNA *ptr)
 {
-       if(block && node->id) {
+       uiBlock *block= uiLayoutAbsoluteBlock(layout);
+       bNode *node= ptr->data;
+       bNodeTree *ntree= ptr->id.data;
+       rctf *butr= &node->butr;
+
+       if(node->id) {
                Scene *scene= (Scene *)node->id;
                uiBut *bt;
                char *strp;
@@ -1086,7 +1009,7 @@ static int node_composit_buts_renderlayers(uiBlock *block, bNodeTree *ntree, bNo
                /* browse button layer */
                strp= scene_layer_menu(node->id?(Scene *)node->id:scene);
                if(node->id)
-                       bt= uiDefIconTextButS(block, MENU, B_NODE_EXEC, ICON_SCENE_DATA, strp, 
+                       bt= uiDefIconTextButS(block, MENU, B_NODE_EXEC, ICON_RENDERLAYERS, strp, 
                                  butr->xmin+20, butr->ymin, (butr->xmax-butr->xmin)-40, 19, 
                                  &node->custom1, 0, 0, 0, 0, "Choose Render Layer");
                else
@@ -1103,753 +1026,389 @@ static int node_composit_buts_renderlayers(uiBlock *block, bNodeTree *ntree, bNo
                                  &node->custom2, 0, 0, 0, 0, "Re-render this Layer");
                
        }
-       return 19;
 }
 
-static void node_blur_relative_cb(bContext *C, void *node, void *poin2)
+
+static void node_composit_buts_blur(uiLayout *layout, PointerRNA *ptr)
 {
-       bNode *nodev= node;
-       NodeBlurData *nbd= nodev->storage;
-       if(nbd->image_in_width != 0){
-               if(nbd->relative){ /* convert absolute values to relative */
-                       nbd->percentx= (float)(nbd->sizex)/nbd->image_in_width;
-                       nbd->percenty= (float)(nbd->sizey)/nbd->image_in_height;
-               }else{ /* convert relative values to absolute */
-                       nbd->sizex= (int)(nbd->percentx*nbd->image_in_width);
-                       nbd->sizey= (int)(nbd->percenty*nbd->image_in_height);
-               }
+       uiLayout *col;
+       
+       col= uiLayoutColumn(layout, 0);
+       
+       uiItemR(col, "", 0, ptr, "filter_type", 0);
+       /* Only for "Fast Gaussian" */
+       if (RNA_enum_get(ptr, "filter_type")!= 7) {
+               uiItemR(col, NULL, 0, ptr, "bokeh", 0);
+               uiItemR(col, NULL, 0, ptr, "gamma", 0);
+       }
+       
+       uiItemR(col, NULL, 0, ptr, "relative", 0);
+       col= uiLayoutColumn(layout, 1);
+       if (RNA_boolean_get(ptr, "relative")== 1) {
+               uiItemR(col, "X", 0, ptr, "factor_x", 0);
+               uiItemR(col, "Y", 0, ptr, "factor_y", 0);
+       }
+       else {
+               uiItemR(col, "X", 0, ptr, "sizex", 0);
+               uiItemR(col, "Y", 0, ptr, "sizey", 0);
        }
-       // allqueue(REDRAWNODE, 0);
 }
-static void node_blur_update_sizex_cb(bContext *C, void *node, void *poin2)
-{
-       bNode *nodev= node;
-       NodeBlurData *nbd= nodev->storage;
 
-       nbd->sizex= (int)(nbd->percentx*nbd->image_in_width);
-}
-static void node_blur_update_sizey_cb(bContext *C, void *node, void *poin2)
+static void node_composit_buts_dblur(uiLayout *layout, PointerRNA *ptr)
 {
-       bNode *nodev= node;
-       NodeBlurData *nbd= nodev->storage;
-
-       nbd->sizey= (int)(nbd->percenty*nbd->image_in_height);
+       uiLayout *col;
+       
+       uiItemR(layout, NULL, 0, ptr, "iterations", 0);
+       uiItemR(layout, NULL, 0, ptr, "wrap", 0);
+       
+       col= uiLayoutColumn(layout, 1);
+       uiItemL(col, "Center:", 0);
+       uiItemR(col, "X", 0, ptr, "center_x", 0);
+       uiItemR(col, "Y", 0, ptr, "center_y", 0);
+       
+       uiItemS(layout);
+       
+       col= uiLayoutColumn(layout, 1);
+       uiItemR(col, NULL, 0, ptr, "distance", 0);
+       uiItemR(col, NULL, 0, ptr, "angle", 0);
+       
+       uiItemS(layout);
+       
+       uiItemR(layout, NULL, 0, ptr, "spin", 0);
+       uiItemR(layout, NULL, 0, ptr, "zoom", 0);
 }
-static int node_composit_buts_blur(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
-{
-       if(block) {
-               NodeBlurData *nbd= node->storage;
-               uiBut *bt;
-               short dy= butr->ymin+58;
-               short dx= (butr->xmax-butr->xmin)/2;
-               char str[256];
-               
-               uiBlockBeginAlign(block);
-               sprintf(str, "Filter Type%%t|Flat %%x%d|Tent %%x%d|Quad %%x%d|Cubic %%x%d|Gauss %%x%d|Fast Gauss%%x%d|CatRom %%x%d|Mitch %%x%d", R_FILTER_BOX, R_FILTER_TENT, R_FILTER_QUAD, R_FILTER_CUBIC, R_FILTER_GAUSS, R_FILTER_FAST_GAUSS, R_FILTER_CATROM, R_FILTER_MITCH);
-               uiDefButS(block, MENU, B_NODE_EXEC,str,
-                                 butr->xmin, dy, dx*2, 19, 
-                                 &nbd->filtertype, 0, 0, 0, 0, "Set sampling filter for blur");
-               dy-=19;
-               if (nbd->filtertype != R_FILTER_FAST_GAUSS) { 
-                       uiDefButC(block, TOG, B_NODE_EXEC, "Bokeh",
-                                       butr->xmin, dy, dx, 19, 
-                                       &nbd->bokeh, 0, 0, 0, 0, "Uses circular filter, warning it's slow!");
-                       uiDefButC(block, TOG, B_NODE_EXEC, "Gamma",
-                                       butr->xmin+dx, dy, dx, 19, 
-                                       &nbd->gamma, 0, 0, 0, 0, "Applies filter on gamma corrected values");
-               } else {
-                       uiBlockEndAlign(block);
-                       uiBlockBeginAlign(block);
-               }
-               dy-=19;
-               bt= uiDefButS(block, TOG, B_NOP, "Relative",
-                                 butr->xmin, dy, dx*2, 19,
-                                 &nbd->relative, 0, 0, 0, 0, "Use relative (percent) values to define blur radius");
-               uiButSetFunc(bt, node_blur_relative_cb, node, NULL);
-
-               dy-=19;
-               if(nbd->relative) {
-                       bt= uiDefButF(block, NUM, B_NODE_EXEC, "X:",
-                                                butr->xmin, dy, dx, 19, 
-                                                &nbd->percentx, 0.0f, 1.0f, 0, 0, "");
-                       uiButSetFunc(bt, node_blur_update_sizex_cb, node, NULL);
-                       bt= uiDefButF(block, NUM, B_NODE_EXEC, "Y:",
-                                                butr->xmin+dx, dy, dx, 19, 
-                                                &nbd->percenty, 0.0f, 1.0f, 0, 0, "");
-                       uiButSetFunc(bt, node_blur_update_sizey_cb, node, NULL);
-               }
-               else {
-                       uiDefButS(block, NUM, B_NODE_EXEC, "X:",
-                                                butr->xmin, dy, dx, 19, 
-                                                &nbd->sizex, 0, 256, 0, 0, "");
-                       uiDefButS(block, NUM, B_NODE_EXEC, "Y:",
-                                                butr->xmin+dx, dy, dx, 19, 
-                                                &nbd->sizey, 0, 256, 0, 0, "");
-               }
-               uiBlockEndAlign(block);
-       }
-       return 77;
+
+static void node_composit_buts_bilateralblur(uiLayout *layout, PointerRNA *ptr)
+{      
+       uiLayout *col;
+       
+       col= uiLayoutColumn(layout, 1);
+       uiItemR(col, NULL, 0, ptr, "iterations", 0);
+       uiItemR(col, NULL, 0, ptr, "sigma_color", 0);
+       uiItemR(col, NULL, 0, ptr, "sigma_space", 0);
 }
 
-static int node_composit_buts_dblur(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+/* qdn: defocus node */
+static void node_composit_buts_defocus(uiLayout *layout, PointerRNA *ptr)
 {
-       if(block) {
-               NodeDBlurData *ndbd = node->storage;
-               short dy = butr->ymin + 171;
-               short dx = butr->xmax - butr->xmin;
-               short halfdx= (short)dx/2;
-
-               uiBlockBeginAlign(block);
-               uiDefButS(block, NUM, B_NODE_EXEC, "Iterations:",
-                               butr->xmin, dy, dx, 19,
-                               &ndbd->iter, 1, 32, 10, 0, "Amount of iterations");
-               uiDefButC(block, TOG, B_NODE_EXEC, "Wrap",
-                               butr->xmin, dy-= 19, dx, 19, 
-                               &ndbd->wrap, 0, 0, 0, 0, "Wrap blur");
-               uiBlockEndAlign(block);
-
-               dy-= 9;
-
-               uiDefBut(block, LABEL, B_NOP, "Center", butr->xmin, dy-= 19, dx, 19, NULL, 0.0f, 0.0f, 0, 0, "");
-
-               uiBlockBeginAlign(block);
-               uiDefButF(block, NUM, B_NODE_EXEC, "X:",
-                               butr->xmin, dy-= 19, halfdx, 19,
-                               &ndbd->center_x, 0.0f, 1.0f, 10, 0, "X center in percents");
-               uiDefButF(block, NUM, B_NODE_EXEC, "Y:",
-                               butr->xmin+halfdx, dy, halfdx, 19,
-                               &ndbd->center_y, 0.0f, 1.0f, 10, 0, "Y center in percents");
-               uiBlockEndAlign(block);
-
-               dy-= 9;
-
-               uiBlockBeginAlign(block);
-               uiDefButF(block, NUM, B_NODE_EXEC, "Distance:",
-                               butr->xmin, dy-= 19, dx, 19,
-                               &ndbd->distance, -1.0f, 1.0f, 10, 0, "Amount of which the image moves");
-               uiDefButF(block, NUM, B_NODE_EXEC, "Angle:",
-                               butr->xmin, dy-= 19, dx, 19,
-                               &ndbd->angle, 0.0f, 360.0f, 1000, 0, "Angle in which the image will be moved");
-               uiBlockEndAlign(block);
+       uiLayout *sub, *col;
+       
+       col= uiLayoutColumn(layout, 0);
+       uiItemL(col, "Bokeh Type:", 0);
+       uiItemR(col, "", 0, ptr, "bokeh", 0);
+       uiItemR(col, NULL, 0, ptr, "angle", 0);
 
-               dy-= 9;
+       uiItemR(layout, NULL, 0, ptr, "gamma_correction", 0);
 
-               uiDefButF(block, NUM, B_NODE_EXEC, "Spin:",
-                               butr->xmin, dy-= 19, dx, 19,
-                               &ndbd->spin, -360.0f, 360.0f, 1000, 0, "Angle that is used to spin the image");
+       col = uiLayoutColumn(layout, 0);
+       uiLayoutSetActive(col, RNA_boolean_get(ptr, "use_zbuffer")==0);
+       uiItemR(col, NULL, 0, ptr, "f_stop", 0);
 
-               dy-= 9;
+       uiItemR(layout, NULL, 0, ptr, "max_blur", 0);
+       uiItemR(layout, NULL, 0, ptr, "threshold", 0);
+       
+       // Preview
+       col = uiLayoutColumn(layout, 0);
+       uiItemR(col, NULL, 0, ptr, "preview", 0);
+       sub = uiLayoutColumn(col, 0);
+       uiLayoutSetActive(sub, RNA_boolean_get(ptr, "preview"));
+       uiItemR(sub, NULL, 0, ptr, "samples", 0);
+       
+       // Z-Buffer
+       col = uiLayoutColumn(layout, 0);
+       uiItemR(col, NULL, 0, ptr, "use_zbuffer", 0);
+       sub = uiLayoutColumn(col, 0);
+       uiLayoutSetActive(sub, RNA_boolean_get(ptr, "use_zbuffer"));
+       uiItemR(sub, NULL, 0, ptr, "z_scale", 0);
+}
 
-               uiDefButF(block, NUM, B_NODE_EXEC, "Zoom:",
-                               butr->xmin, dy-= 19, dx, 19,
-                               &ndbd->zoom, 0.0f, 100.0f, 100, 0, "Amount of which the image is zoomed");
+/* qdn: glare node */
+static void node_composit_buts_glare(uiLayout *layout, PointerRNA *ptr)
+{      
+       uiItemR(layout, "", 0, ptr, "glare_type", 0);
+       uiItemR(layout, "", 0, ptr, "quality", 0);
 
+       if (RNA_enum_get(ptr, "glare_type")!= 1) {
+               uiItemR(layout, NULL, 0, ptr, "iterations", 0);
+       
+               if (RNA_enum_get(ptr, "glare_type")!= 0) 
+                       uiItemR(layout, NULL, 0, ptr, "color_modulation", UI_ITEM_R_SLIDER);
        }
-       return 190;
-}
+       
+       uiItemR(layout, NULL, 0, ptr, "mix", 0);                
+       uiItemR(layout, NULL, 0, ptr, "threshold", 0);
 
-static int node_composit_buts_bilateralblur(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
-{
-       if(block) {
-               NodeBilateralBlurData *nbbd= node->storage;
-               short dy= butr->ymin+38;
-               short dx= (butr->xmax-butr->xmin);
-               
-               uiBlockBeginAlign(block);
-               uiDefButS(block, NUM, B_NODE_EXEC, "Iterations:",
-                                butr->xmin, dy, dx, 19, 
-                                &nbbd->iter, 1, 128, 0, 0, "Amount of iterations");
-               dy-=19;
-               uiDefButF(block, NUM, B_NODE_EXEC, "Color Sigma:",
-                                 butr->xmin, dy, dx, 19, 
-                                 &nbbd->sigma_color,0.01, 3, 10, 0, "Sigma value used to modify color");
-               dy-=19;
-               uiDefButF(block, NUM, B_NODE_EXEC, "Space Sigma:",
-                                 butr->xmin, dy, dx, 19, 
-                                 &nbbd->sigma_space ,0.01, 30, 10, 0, "Sigma value used to modify space");
+       if (RNA_enum_get(ptr, "glare_type")== 2) {
+               uiItemR(layout, NULL, 0, ptr, "streaks", 0);            
+               uiItemR(layout, NULL, 0, ptr, "angle_offset", 0);
+       }
+       if (RNA_enum_get(ptr, "glare_type")== 0 || RNA_enum_get(ptr, "glare_type")== 2) {
+               uiItemR(layout, NULL, 0, ptr, "fade", UI_ITEM_R_SLIDER);
                
+               if (RNA_enum_get(ptr, "glare_type")== 0) 
+                       uiItemR(layout, NULL, 0, ptr, "rotate_45", 0);
        }
-       return 57;
-}
-
-/* qdn: defocus node */
-static int node_composit_buts_defocus(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
-{
-       if(block) {
-               NodeDefocus *nqd = node->storage;
-               short dy = butr->ymin + 209;
-               short dx = butr->xmax - butr->xmin; 
-               char* mstr1 = "Bokeh Type%t|Octagon %x8|Heptagon %x7|Hexagon %x6|Pentagon %x5|Square %x4|Triangle %x3|Disk %x0";
-
-               uiDefBut(block, LABEL, B_NOP, "Bokeh Type", butr->xmin, dy, dx, 19, NULL, 0, 0, 0, 0, "");
-               uiDefButC(block, MENU, B_NODE_EXEC, mstr1,
-                         butr->xmin, dy-19, dx, 19,
-                         &nqd->bktype, 0, 0, 0, 0, "Bokeh type");
-               if (nqd->bktype) { /* for some reason rotating a disk doesn't seem to work... ;) */
-                       uiDefButC(block, NUM, B_NODE_EXEC, "Rotate:",
-                                 butr->xmin, dy-38, dx, 19,
-                                 &nqd->rotation, 0, 90, 0, 0, "Bokeh shape rotation offset in degrees");
-               }
-               uiDefButC(block, TOG, B_NODE_EXEC, "Gamma Correct",
-                         butr->xmin, dy-57, dx, 19,
-                         &nqd->gamco, 0, 0, 0, 0, "Enable gamma correction before and after main process");
-               if (nqd->no_zbuf==0) {
-                       // only needed for zbuffer input
-                       uiDefButF(block, NUM, B_NODE_EXEC, "fStop:",
-                                 butr->xmin, dy-76, dx, 19,
-                                 &nqd->fstop, 0.5, 128, 10, 0, "Amount of focal blur, 128=infinity=perfect focus, half the value doubles the blur radius");
-               }
-               uiDefButF(block, NUM, B_NODE_EXEC, "Maxblur:",
-                         butr->xmin, dy-95, dx, 19,
-                         &nqd->maxblur, 0, 10000, 1000, 0, "blur limit, maximum CoC radius, 0=no limit");
-               uiDefButF(block, NUM, B_NODE_EXEC, "BThreshold:",
-                         butr->xmin, dy-114, dx, 19,
-                         &nqd->bthresh, 0, 100, 100, 0, "CoC radius threshold, prevents background bleed on in-focus midground, 0=off");
-               uiDefButC(block, TOG, B_NODE_EXEC, "Preview",
-                         butr->xmin, dy-142, dx, 19,
-                         &nqd->preview, 0, 0, 0, 0, "Enable sampling mode, useful for preview when using low samplecounts");
-               if (nqd->preview) {
-                       /* only visible when sampling mode enabled */
-                       uiDefButS(block, NUM, B_NODE_EXEC, "Samples:",
-                                 butr->xmin, dy-161, dx, 19,
-                                 &nqd->samples, 16, 256, 0, 0, "Number of samples (16=grainy, higher=less noise)");
-               }
-               uiDefButS(block, TOG, B_NODE_EXEC, "No zbuffer",
-                         butr->xmin, dy-190, dx, 19,
-                         &nqd->no_zbuf, 0, 0, 0, 0, "Enable when using an image as input instead of actual zbuffer (auto enabled if node not image based, eg. time node)");
-               if (nqd->no_zbuf) {
-                       uiDefButF(block, NUM, B_NODE_EXEC, "Zscale:",
-                           butr->xmin, dy-209, dx, 19,
-                           &nqd->scale, 0, 1000, 100, 0, "Scales the Z input when not using a zbuffer, controls maximum blur designated by the color white or input value 1");
-               }
+       if (RNA_enum_get(ptr, "glare_type")== 1) {
+               uiItemR(layout, NULL, 0, ptr, "size", 0);
        }
-       return 228;
 }
 
+/* qdn: tonemap node */
+static void node_composit_buts_tonemap(uiLayout *layout, PointerRNA *ptr)
+{      
+       uiLayout *col;
 
-/* qdn: glare node */
-static int node_composit_buts_glare(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
-{
-       if(block) {
-               NodeGlare *ndg = node->storage;
-               short dy = butr->ymin + 152, dx = butr->xmax - butr->xmin; 
-               char* mn1 = "Type%t|Ghosts%x3|Streaks%x2|Fog Glow%x1|Simple Star%x0";
-               char* mn2 = "Quality/Speed%t|High/Slow%x0|Medium/Medium%x1|Low/Fast%x2";
-               uiDefButC(block, MENU, B_NODE_EXEC, mn1,
-                         butr->xmin, dy, dx, 19,
-                         &ndg->type, 0, 0, 0, 0, "Glow/Flare/Bloom type");
-               uiDefButC(block, MENU, B_NODE_EXEC, mn2,
-                         butr->xmin, dy-19, dx, 19,
-                         &ndg->quality, 0, 0, 0, 0,
-                         "Quality speed trade off, if not set to high quality, effect will be applied to low-res copy of source image");
-               if (ndg->type != 1) {
-                       uiDefButC(block, NUM, B_NODE_EXEC, "Iterations:",
-                                 butr->xmin, dy-38, dx, 19,
-                                 &ndg->iter, 2, 5, 1, 0,
-                                 "higher values will generate longer/more streaks/ghosts");
-                       if (ndg->type != 0)
-                               uiDefButF(block, NUM, B_NODE_EXEC, "ColMod:",
-                                         butr->xmin, dy-57, dx, 19,
-                                         &ndg->colmod, 0, 1, 10, 0,
-                                         "Amount of Color Modulation, modulates colors of streaks and ghosts for a spectral dispersion effect");
-               }
-               uiDefButF(block, NUM, B_NODE_EXEC, "Mix:",
-                         butr->xmin, dy-76, dx, 19,
-                         &ndg->mix, -1, 1, 10, 0,
-                         "Mix balance, -1 is original image only, 0 is exact 50/50 mix, 1 is processed image only");
-               uiDefButF(block, NUM, B_NODE_EXEC, "Threshold:",
-                         butr->xmin, dy-95, dx, 19,
-                         &ndg->threshold, 0, 1000, 10, 0,
-                         "Brightness threshold, the glarefilter will be applied only to pixels brighter than this value");
-               if ((ndg->type == 2) || (ndg->type == 0))
-               {
-                       if (ndg->type == 2) {
-                               uiDefButC(block, NUM, B_NODE_EXEC, "streaks:",
-                                         butr->xmin, dy-114, dx, 19,
-                                         &ndg->angle, 2, 16, 1000, 0,
-                                         "Total number of streaks");
-                               uiDefButC(block, NUM, B_NODE_EXEC, "AngOfs:",
-                                         butr->xmin, dy-133, dx, 19,
-                                         &ndg->angle_ofs, 0, 180, 1000, 0,
-                                         "Streak angle rotation offset in degrees");
-                       }
-                       uiDefButF(block, NUM, B_NODE_EXEC, "Fade:",
-                                 butr->xmin, dy-152, dx, 19,
-                                 &ndg->fade, 0.75, 1, 5, 0,
-                                 "Streak fade out factor");
-               }
-               if (ndg->type == 0)
-                       uiDefButC(block, TOG, B_NODE_EXEC, "Rot45",
-                                 butr->xmin, dy-114, dx, 19,
-                                 &ndg->angle, 0, 0, 0, 0,
-                                 "simple star filter, add 45 degree rotation offset");
-               if ((ndg->type == 1) || (ndg->type > 3))        // PBGH and fog glow
-                       uiDefButC(block, NUM, B_NODE_EXEC, "Size:",
-                                 butr->xmin, dy-114, dx, 19,
-                                 &ndg->size, 6, 9, 1000, 0,
-                                 "glow/glare size (not actual size, relative to initial size of bright area of pixels)");
+       col = uiLayoutColumn(layout, 0);
+       uiItemR(col, "", 0, ptr, "tonemap_type", 0);
+       if (RNA_enum_get(ptr, "tonemap_type")== 0) {
+               uiItemR(col, NULL, 0, ptr, "key", UI_ITEM_R_SLIDER);
+               uiItemR(col, NULL, 0, ptr, "offset", 0);
+               uiItemR(col, NULL, 0, ptr, "gamma", 0);
        }
-       return 171;
-}
-
-/* qdn: tonemap node */
-static int node_composit_buts_tonemap(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
-{
-       if(block) {
-               NodeTonemap *ntm = node->storage;
-               short dy = butr->ymin + 76, dx = butr->xmax - butr->xmin; 
-               char* mn = "Type%t|R/D Photoreceptor%x1|Rh Simple%x0";
-               
-               uiBlockBeginAlign(block);
-               uiDefButI(block, MENU, B_NODE_EXEC, mn,
-                         butr->xmin, dy, dx, 19,
-                         &ntm->type, 0, 0, 0, 0,
-                         "Tone mapping type");
-               if (ntm->type == 0) {
-                       uiDefButF(block, NUM, B_NODE_EXEC, "Key:",
-                                 butr->xmin, dy-19, dx, 19,
-                                 &ntm->key, 0, 1, 5, 0,
-                                 "The value the average luminance is mapped to");
-                       uiDefButF(block, NUM, B_NODE_EXEC, "Offset:",
-                                 butr->xmin, dy-38, dx, 19,
-                                 &ntm->offset, 0.001, 10, 5, 0,
-                                 "Tonemap offset, normally always 1, but can be used as an extra control to alter the brightness curve");
-                       uiDefButF(block, NUM, B_NODE_EXEC, "Gamma:",
-                                 butr->xmin, dy-57, dx, 19,
-                                 &ntm->gamma, 0.001, 3, 5, 0,
-                                 "Gamma factor, if not used, set to 1");
-               }
-               else {
-                       uiDefButF(block, NUM, B_NODE_EXEC, "Intensity:",
-                                 butr->xmin, dy-19, dx, 19,
-                                 &ntm->f, -8, 8, 10, 0, "if less than zero, darkens image, otherwise makes it brighter");
-                       uiDefButF(block, NUM, B_NODE_EXEC, "Contrast:",
-                                 butr->xmin, dy-38, dx, 19,
-                                 &ntm->m, 0, 1, 5, 0, "Set to 0 to use estimate from input image");
-                       uiDefButF(block, NUM, B_NODE_EXEC, "Adaptation:",
-                                 butr->xmin, dy-57, dx, 19,
-                                 &ntm->a, 0, 1, 5, 0, "if 0, global, if 1, based on pixel intensity");
-                       uiDefButF(block, NUM, B_NODE_EXEC, "ColCorrect:",
-                                 butr->xmin, dy-76, dx, 19,
-                                 &ntm->c, 0, 1, 5, 0, "color correction, if 0, same for all channels, if 1, each independent");
-               }
-               uiBlockEndAlign(block);
+       else {
+               uiItemR(col, NULL, 0, ptr, "intensity", 0);
+               uiItemR(col, NULL, 0, ptr, "contrast", UI_ITEM_R_SLIDER);
+               uiItemR(col, NULL, 0, ptr, "adaptation", UI_ITEM_R_SLIDER);
+               uiItemR(col, NULL, 0, ptr, "correction", UI_ITEM_R_SLIDER);
        }
-       return 95;
 }
 
 /* qdn: lens distortion node */
-static int node_composit_buts_lensdist(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+static void node_composit_buts_lensdist(uiLayout *layout, PointerRNA *ptr)
 {
-       if(block) {
-               NodeLensDist *nld = node->storage;
-               short dy = butr->ymin + 19, dx = butr->xmax - butr->xmin; 
-               uiBlockBeginAlign(block);
-               uiDefButS(block, TOG, B_NODE_EXEC, "Projector",
-                         butr->xmin, dy, dx, 19,
-                         &nld->proj, 0, 0, 0, 0,
-                         "Enable/disable projector mode, effect is applied in horizontal direction only");
-               if (!nld->proj) {
-                       uiDefButS(block, TOG, B_NODE_EXEC, "Jitter",
-                                 butr->xmin, dy-19, dx/2, 19,
-                                 &nld->jit, 0, 0, 0, 0,
-                                 "Enable/disable jittering, faster, but also noisier");
-                       uiDefButS(block, TOG, B_NODE_EXEC, "Fit",
-                                 butr->xmin+dx/2, dy-19, dx/2, 19,
-                                 &nld->fit, 0, 0, 0, 0,
-                                 "For positive distortion factor only, scale image such that black areas are not visible");
-               }
-               uiBlockEndAlign(block);
-       }
-       return 38;
-}
+       uiLayout *col;
 
+       col= uiLayoutColumn(layout, 0);
+       uiItemR(col, NULL, 0, ptr, "projector", 0);
 
-static int node_composit_buts_vecblur(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
-{
-       if(block) {
-               NodeBlurData *nbd= node->storage;
-               short dy= butr->ymin;
-               short dx= (butr->xmax-butr->xmin);
-               
-               uiBlockBeginAlign(block);
-               uiDefButS(block, NUM, B_NODE_EXEC, "Samples:",
-                                butr->xmin, dy+76, dx, 19, 
-                                &nbd->samples, 1, 256, 0, 0, "Amount of samples");
-               uiDefButS(block, NUM, B_NODE_EXEC, "MinSpeed:",
-                                 butr->xmin, dy+57, dx, 19, 
-                                 &nbd->minspeed, 0, 1024, 0, 0, "Minimum speed for a pixel to be blurred, used to separate background from foreground");
-               uiDefButS(block, NUM, B_NODE_EXEC, "MaxSpeed:",
-                                 butr->xmin, dy+38, dx, 19, 
-                                 &nbd->maxspeed, 0, 1024, 0, 0, "If not zero, maximum speed in pixels");
-               uiDefButF(block, NUM, B_NODE_EXEC, "BlurFac:",
-                                 butr->xmin, dy+19, dx, 19, 
-                                 &nbd->fac, 0.0f, 2.0f, 10, 2, "Scaling factor for motion vectors, actually 'shutter speed' in frames");
-               uiDefButS(block, TOG, B_NODE_EXEC, "Curved",
-                                 butr->xmin, dy, dx, 19, 
-                                 &nbd->curved, 0.0f, 2.0f, 10, 2, "Interpolate between frames in a bezier curve, rather than linearly");
-               uiBlockEndAlign(block);
-       }
-       return 95;
+       col = uiLayoutColumn(col, 0);
+       uiLayoutSetActive(col, RNA_boolean_get(ptr, "projector")==0);
+       uiItemR(col, NULL, 0, ptr, "jitter", 0);
+       uiItemR(col, NULL, 0, ptr, "fit", 0);
 }
 
-static int node_composit_buts_filter(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+static void node_composit_buts_vecblur(uiLayout *layout, PointerRNA *ptr)
 {
-       if(block) {
-               uiBut *bt;
-               
-               /* blend type */
-               bt=uiDefButS(block, MENU, B_NODE_EXEC, "Soften %x0|Sharpen %x1|Laplace %x2|Sobel %x3|Prewitt %x4|Kirsch %x5|Shadow %x6",
-                                        butr->xmin, butr->ymin, butr->xmax-butr->xmin, 20, 
-                                        &node->custom1, 0, 0, 0, 0, "");
-               uiButSetFunc(bt, node_but_title_cb, node, bt);
-       }
-       return 20;
+       uiLayout *col;
+       
+       col= uiLayoutColumn(layout, 0);
+       uiItemR(col, NULL, 0, ptr, "samples", 0);
+       uiItemR(col, "Blur", 0, ptr, "factor", 0);
+       
+       col= uiLayoutColumn(layout, 1);
+       uiItemL(col, "Speed:", 0);
+       uiItemR(col, "Min", 0, ptr, "min_speed", 0);
+       uiItemR(col, "Max", 0, ptr, "max_speed", 0);
+
+       uiItemR(layout, NULL, 0, ptr, "curved", 0);
 }
 
-static int node_composit_buts_flip(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr) 
+static void node_composit_buts_filter(uiLayout *layout, PointerRNA *ptr)
 {
-       if(block) {
-               uiBut *bt;
-               
-               /* flip x\y */
-               bt=uiDefButS(block, MENU, B_NODE_EXEC, "Flip X %x0|Flip Y %x1|Flip X & Y %x2",
-                                        butr->xmin, butr->ymin, butr->xmax-butr->xmin, 20, 
-                                        &node->custom1, 0, 0, 0, 0, "");
-               uiButSetFunc(bt, node_but_title_cb, node, bt);
-       }
-       return 20;      
+       uiItemR(layout, "", 0, ptr, "filter_type", 0);
 }
 
-static int node_composit_buts_crop(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+static void node_composit_buts_flip(uiLayout *layout, PointerRNA *ptr)
 {
-       if(block) {
-               NodeTwoXYs *ntxy= node->storage;
-               char elementheight = 19;
-               short dx= (butr->xmax-butr->xmin)/2;
-               short dy= butr->ymax - elementheight;
-               short xymin= 0, xymax= 10000;
-
-               uiBlockBeginAlign(block);
-
-               /* crop image size toggle */
-               uiDefButS(block, TOG, B_NODE_EXEC, "Crop Image Size",
-                                 butr->xmin, dy, dx*2, elementheight, 
-                                 &node->custom1, 0, 0, 0, 0, "Crop the size of the input image.");
-
-               dy-=elementheight;
-
-               /* x1 */
-               uiDefButS(block, NUM, B_NODE_EXEC, "X1:",
-                                        butr->xmin, dy, dx, elementheight,
-                                        &ntxy->x1, xymin, xymax, 0, 0, "");
-               /* y1 */
-               uiDefButS(block, NUM, B_NODE_EXEC, "Y1:",
-                                        butr->xmin+dx, dy, dx, elementheight,
-                                        &ntxy->y1, xymin, xymax, 0, 0, "");
-
-               dy-=elementheight;
-
-               /* x2 */
-               uiDefButS(block, NUM, B_NODE_EXEC, "X2:",
-                                        butr->xmin, dy, dx, elementheight,
-                                        &ntxy->x2, xymin, xymax, 0, 0, "");
-               /* y2 */
-               uiDefButS(block, NUM, B_NODE_EXEC, "Y2:",
-                                        butr->xmin+dx, dy, dx, elementheight,
-                                        &ntxy->y2, xymin, xymax, 0, 0, "");
-
-               uiBlockEndAlign(block);
-       }
-       return 60;
+       uiItemR(layout, "", 0, ptr, "axis", 0);
 }
 
-static int node_composit_buts_splitviewer(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+static void node_composit_buts_crop(uiLayout *layout, PointerRNA *ptr)
 {
-       if(block) {     
-               uiBlockBeginAlign(block);
-               
-               uiDefButS(block, ROW, B_NODE_EXEC, "X",
-                                 butr->xmin, butr->ymin+19, (butr->xmax-butr->xmin)/2, 20, 
-                                 &node->custom2, 0.0, 0.0, 0, 0, "");
-               uiDefButS(block, ROW, B_NODE_EXEC, "Y",
-                                 butr->xmin+(butr->xmax-butr->xmin)/2, butr->ymin+19, (butr->xmax-butr->xmin)/2, 20, 
-                                 &node->custom2, 0.0, 1.0, 0, 0, "");
-                                 
-               uiDefButS(block, NUMSLI, B_NODE_EXEC, "Split %: ",
-                               butr->xmin, butr->ymin, butr->xmax-butr->xmin, 20, &node->custom1, 0, 100, 10, 0, "");
-       }
-       return 40;
+       uiLayout *col;
+       
+       uiItemR(layout, NULL, 0, ptr, "crop_size", 0);
+       
+       col= uiLayoutColumn(layout, 1);
+       uiItemR(col, "Left", 0, ptr, "x1", 0);
+       uiItemR(col, "Right", 0, ptr, "x2", 0);
+       uiItemR(col, "Up", 0, ptr, "y1", 0);
+       uiItemR(col, "Down", 0, ptr, "y2", 0);
 }
 
-static int node_composit_buts_map_value(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+static void node_composit_buts_splitviewer(uiLayout *layout, PointerRNA *ptr)
 {
-       if(block) {
-               TexMapping *texmap= node->storage;
-               short xstart= (short)butr->xmin;
-               short dy= (short)(butr->ymax-19.0f);
-               short dx= (short)(butr->xmax-butr->xmin)/2;
-               
-               uiBlockBeginAlign(block);
-               uiDefButF(block, NUM, B_NODE_EXEC, "Offs:", xstart, dy, 2*dx, 19, texmap->loc, -1000.0f, 1000.0f, 10, 2, "");
-               dy-= 19;
-               uiDefButF(block, NUM, B_NODE_EXEC, "Size:", xstart, dy, 2*dx, 19, texmap->size, -1000.0f, 1000.0f, 10, 3, "");
-               dy-= 23;
-               uiBlockBeginAlign(block);
-               uiDefButBitI(block, TOG, TEXMAP_CLIP_MIN, B_NODE_EXEC, "Min", xstart, dy, dx, 19, &texmap->flag, 0.0f, 0.0f, 0, 0, "");
-               uiDefButF(block, NUM, B_NODE_EXEC, "", xstart+dx, dy, dx, 19, texmap->min, -1000.0f, 1000.0f, 10, 2, "");
-               dy-= 19;
-               uiDefButBitI(block, TOG, TEXMAP_CLIP_MAX, B_NODE_EXEC, "Max", xstart, dy, dx, 19, &texmap->flag, 0.0f, 0.0f, 0, 0, "");
-               uiDefButF(block, NUM, B_NODE_EXEC, "", xstart+dx, dy, dx, 19, texmap->max, -1000.0f, 1000.0f, 10, 2, "");
-       }
-       return 80;
+       uiLayout *row, *col;
+       
+       col= uiLayoutColumn(layout, 0);
+       row= uiLayoutRow(col, 0);
+       uiItemR(row, NULL, 0, ptr, "axis", UI_ITEM_R_EXPAND);
+       uiItemR(col, NULL, 0, ptr, "factor", 0);
 }
 
-static int node_composit_buts_alphaover(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+static void node_composit_buts_map_value(uiLayout *layout, PointerRNA *ptr)
 {
-       if(block) {
-               NodeTwoFloats *ntf= node->storage;
-               
-               /* alpha type */
-               uiDefButS(block, TOG, B_NODE_EXEC, "ConvertPremul",
-                                 butr->xmin, butr->ymin+19, butr->xmax-butr->xmin, 19, 
-                                 &node->custom1, 0, 0, 0, 0, "");
-               /* mix factor */
-               uiDefButF(block, NUM, B_NODE_EXEC, "Premul: ",
-                                 butr->xmin, butr->ymin, butr->xmax-butr->xmin, 19, 
-                                 &ntf->x, 0.0f, 1.0f, 100, 0, "");
-       }
-       return 38;
+       uiLayout *sub, *col;
+       
+       col =uiLayoutColumn(layout, 1);
+       uiItemR(col, NULL, 0, ptr, "offset", 0);
+       uiItemR(col, NULL, 0, ptr, "size", 0);
+       
+       col =uiLayoutColumn(layout, 1);
+       uiItemR(col, NULL, 0, ptr, "use_min", 0);
+       sub =uiLayoutColumn(col, 0);
+       uiLayoutSetActive(sub, RNA_boolean_get(ptr, "use_min"));
+       uiItemR(sub, "", 0, ptr, "min", 0);
+       
+       col =uiLayoutColumn(layout, 1);
+       uiItemR(col, NULL, 0, ptr, "use_max", 0);
+       sub =uiLayoutColumn(col, 0);
+       uiLayoutSetActive(sub, RNA_boolean_get(ptr, "use_max"));
+       uiItemR(sub, "", 0, ptr, "max", 0);
 }
 
-static int node_composit_buts_hue_sat(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
-{
-       if(block) {
-               NodeHueSat *nhs= node->storage;
-               
-               uiBlockBeginAlign(block);
-               uiDefButF(block, NUMSLI, B_NODE_EXEC, "Hue: ",
-                                 butr->xmin, butr->ymin+40.0f, butr->xmax-butr->xmin, 20, 
-                                 &nhs->hue, 0.0f, 1.0f, 100, 0, "");
-               uiDefButF(block, NUMSLI, B_NODE_EXEC, "Sat: ",
-                                 butr->xmin, butr->ymin+20.0f, butr->xmax-butr->xmin, 20, 
-                                 &nhs->sat, 0.0f, 2.0f, 100, 0, "");
-               uiDefButF(block, NUMSLI, B_NODE_EXEC, "Val: ",
-                                 butr->xmin, butr->ymin, butr->xmax-butr->xmin, 20, 
-                                 &nhs->val, 0.0f, 2.0f, 100, 0, "");
-       }
-       return 60;
+static void node_composit_buts_alphaover(uiLayout *layout, PointerRNA *ptr)
+{      
+       uiLayout *col;
+       
+       col =uiLayoutColumn(layout, 1);
+       /* alpha type */
+       uiItemR(col, NULL, 0, ptr, "convert_premul", 0);
+       /* mix factor */
+       uiItemR(col, NULL, 0, ptr, "premul", 0);
 }
 
-static int node_composit_buts_dilateerode(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+static void node_composit_buts_hue_sat(uiLayout *layout, PointerRNA *ptr)
 {
-       if(block) {
-               uiDefButS(block, NUM, B_NODE_EXEC, "Distance:",
-                                 butr->xmin, butr->ymin, butr->xmax-butr->xmin, 20, 
-                                 &node->custom2, -100, 100, 0, 0, "Distance to grow/shrink (number of iterations)");
-       }
-       return 20;
+       uiLayout *col;
+       
+       col =uiLayoutColumn(layout, 0);
+       uiItemR(col, NULL, 0, ptr, "hue", UI_ITEM_R_SLIDER);
+       uiItemR(col, NULL, 0, ptr, "sat", UI_ITEM_R_SLIDER);
+       uiItemR(col, NULL, 0, ptr, "val", UI_ITEM_R_SLIDER);
 }
 
-static int node_composit_buts_diff_matte(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+static void node_composit_buts_dilateerode(uiLayout *layout, PointerRNA *ptr)
 {
-       if(block) {
-               short sx= (butr->xmax-butr->xmin)/4;
-               short dx= (butr->xmax-butr->xmin)/3;
-               NodeChroma *c= node->storage;
-               
-               uiBlockBeginAlign(block);
-               /*color space selectors*/
-               uiDefButS(block, ROW,B_NODE_EXEC,"RGB",
-                                                       butr->xmin,butr->ymin+60,sx,20,
-                                                       &node->custom1,1,1, 0, 0, "RGB Color Space");
-               uiDefButS(block, ROW,B_NODE_EXEC,"HSV",
-                                                       butr->xmin+sx,butr->ymin+60,sx,20,
-                                                       &node->custom1,1,2, 0, 0, "HSV Color Space");
-               uiDefButS(block, ROW,B_NODE_EXEC,"YUV",
-                                                       butr->xmin+2*sx,butr->ymin+60,sx,20,
-                                                       &node->custom1,1,3, 0, 0, "YUV Color Space");
-                                       uiDefButS(block, ROW,B_NODE_EXEC,"YCC",
-                                                       butr->xmin+3*sx,butr->ymin+60,sx,20,
-                                                       &node->custom1,1,4, 0, 0, "YCbCr Color Space");
-               /*channel tolorences*/
-               uiDefButF(block, NUM, B_NODE_EXEC, " ",
-                                                       butr->xmin, butr->ymin+40, dx, 20,
-                                                       &c->t1, 0.0f, 1.0f, 100, 0, "Channel 1 Tolerance");
-               uiDefButF(block, NUM, B_NODE_EXEC, " ",
-                                                       butr->xmin+dx, butr->ymin+40, dx, 20,
-                                                       &c->t2, 0.0f, 1.0f, 100, 0, "Channel 2 Tolorence");
-               uiDefButF(block, NUM, B_NODE_EXEC, " ",
-                                                       butr->xmin+2*dx, butr->ymin+40, dx, 20,
-                                                       &c->t3, 0.0f, 1.0f, 100, 0, "Channel 3 Tolorence");
-               /*falloff parameters*/
-               /*
-               uiDefButF(block, NUMSLI, B_NODE_EXEC, "Falloff Size ",
-                       butr->xmin, butr->ymin+20, butr->xmax-butr->xmin, 20,
-                       &c->fsize, 0.0f, 1.0f, 100, 0, "");
-               */
-               uiDefButF(block, NUMSLI, B_NODE_EXEC, "Falloff: ",
-                       butr->xmin, butr->ymin+20, butr->xmax-butr->xmin, 20,
-                       &c->fstrength, 0.0f, 1.0f, 100, 0, "");
-       }
-       return 80;
+       uiItemR(layout, NULL, 0, ptr, "distance", 0);
 }
 
-static int node_composit_buts_color_spill(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+static void node_composit_buts_diff_matte(uiLayout *layout, PointerRNA *ptr)
 {
-       if(block) {
-               short dx= (butr->xmax-butr->xmin)/3;
-
-               NodeChroma *c=node->storage;
-               uiBlockBeginAlign(block);
-               uiDefButF(block, NUM, B_NODE_EXEC, "Enhance: ", 
-                               butr->xmin, butr->ymin+20.0, butr->xmax-butr->xmin, 20,
-                               &c->t1, 0.0f, 0.5f, 100, 2, "Adjusts how much selected channel is affected by color spill algorithm");
-               uiDefButS(block, ROW, B_NODE_EXEC, "R",
-                               butr->xmin,butr->ymin,dx,20,
-                               &node->custom1,1,1, 0, 0, "Red Spill Suppression");
-               uiDefButS(block, ROW, B_NODE_EXEC, "G",
-                               butr->xmin+dx,butr->ymin,dx,20,
-                               &node->custom1,1,2, 0, 0, "Green Spill Suppression");
-               uiDefButS(block, ROW, B_NODE_EXEC, "B",
-                               butr->xmin+2*dx,butr->ymin,dx,20,
-                               &node->custom1, 1, 3, 0, 0, "Blue Spill Suppression");
-               uiBlockEndAlign(block);
-       }
-       return 60;
+       uiLayout *col;
+       
+       col =uiLayoutColumn(layout, 1);
+       uiItemR(col, NULL, 0, ptr, "tolerance", UI_ITEM_R_SLIDER);
+       uiItemR(col, NULL, 0, ptr, "falloff", UI_ITEM_R_SLIDER);
 }
 
-static int node_composit_buts_chroma_matte(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+static void node_composit_buts_distance_matte(uiLayout *layout, PointerRNA *ptr)
 {
-       if(block) {
-               short dx=(butr->xmax-butr->xmin)/2;
-               NodeChroma *c= node->storage;
-               uiBlockBeginAlign(block);
-
-               uiDefButF(block, NUMSLI, B_NODE_EXEC, "Acceptance ",
-                       butr->xmin, butr->ymin+60, butr->xmax-butr->xmin, 20,
-                       &c->t1, 1.0f, 80.0f, 100, 0, "Tolerance for colors to be considered a keying color");
-               uiDefButF(block, NUMSLI, B_NODE_EXEC, "Cutoff ",
-                       butr->xmin, butr->ymin+40, butr->xmax-butr->xmin, 20,
-                       &c->t2, 0.0f, 30.0f, 100, 0, "Colors below this will be considered as exact matches for keying color");
-
-               uiDefButF(block, NUMSLI, B_NODE_EXEC, "Lift ",
-                       butr->xmin, butr->ymin+20, dx, 20,
-                       &c->fsize, 0.0f, 1.0f, 100, 0, "Alpha Lift");
-               uiDefButF(block, NUMSLI, B_NODE_EXEC, "Gain ",
-                       butr->xmin+dx, butr->ymin+20, dx, 20,
-                       &c->fstrength, 0.0f, 1.0f, 100, 0, "Alpha Gain");
-
-               uiDefButF(block, NUMSLI, B_NODE_EXEC, "Shadow Adjust ",
-                       butr->xmin, butr->ymin, butr->xmax-butr->xmin, 20,
-                       &c->t3, 0.0f, 1.0f, 100, 0, "Adjusts the brightness of any shadows captured");
-
-               if(c->t2 > c->t1)
-                       c->t2=c->t1;
-       }
-       return 80;
+       uiLayout *col;
+       
+       col =uiLayoutColumn(layout, 1);
+       uiItemR(col, NULL, 0, ptr, "tolerance", UI_ITEM_R_SLIDER);
+       uiItemR(col, NULL, 0, ptr, "falloff", UI_ITEM_R_SLIDER);
 }
 
-static int node_composit_buts_channel_matte(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+static void node_composit_buts_color_spill(uiLayout *layout, PointerRNA *ptr)
 {
-       if(block) {
-               short sx= (butr->xmax-butr->xmin)/4;
-               short cx= (butr->xmax-butr->xmin)/3;
-               NodeChroma *c=node->storage;
-               char *c1, *c2, *c3;
+       uiLayout *row, *col;
        
-               /*color space selectors*/
-               uiBlockBeginAlign(block);
-               uiDefButS(block, ROW,B_NODE_EXEC,"RGB",
-                       butr->xmin,butr->ymin+60,sx,20,&node->custom1,1,1, 0, 0, "RGB Color Space");
-               uiDefButS(block, ROW,B_NODE_EXEC,"HSV",
-                       butr->xmin+sx,butr->ymin+60,sx,20,&node->custom1,1,2, 0, 0, "HSV Color Space");
-               uiDefButS(block, ROW,B_NODE_EXEC,"YUV",
-                       butr->xmin+2*sx,butr->ymin+60,sx,20,&node->custom1,1,3, 0, 0, "YUV Color Space");
-               uiDefButS(block, ROW,B_NODE_EXEC,"YCC",
-                       butr->xmin+3*sx,butr->ymin+60,sx,20,&node->custom1,1,4, 0, 0, "YCbCr Color Space");
-       
-               if (node->custom1==1) {
-                       c1="R"; c2="G"; c3="B";
-               }
-               else if(node->custom1==2){
-                       c1="H"; c2="S"; c3="V";
-               }
-               else if(node->custom1==3){
-                       c1="Y"; c2="U"; c3="V";
-               }
-               else { // if(node->custom1==4){
-                       c1="Y"; c2="Cb"; c3="Cr";
-               }
+       col =uiLayoutColumn(layout, 0);
+       uiItemR(col, NULL, 0, ptr, "factor", 0);
+       row= uiLayoutRow(col, 0);
+       uiItemR(row, NULL, 0, ptr, "channel", UI_ITEM_R_EXPAND);
+}
+
+static void node_composit_buts_chroma_matte(uiLayout *layout, PointerRNA *ptr)
+{
+       uiLayout *col;
        
-               /*channel selector */
-               uiDefButS(block, ROW, B_NODE_EXEC, c1,
-                       butr->xmin,butr->ymin+40,cx,20,&node->custom2,1, 1, 0, 0, "Channel 1");
-               uiDefButS(block, ROW, B_NODE_EXEC, c2,
-                       butr->xmin+cx,butr->ymin+40,cx,20,&node->custom2,1, 2, 0, 0, "Channel 2");
-               uiDefButS(block, ROW, B_NODE_EXEC, c3,
-                       butr->xmin+cx+cx,butr->ymin+40,cx,20,&node->custom2, 1, 3, 0, 0, "Channel 3");
-       
-               /*tolerance sliders */
-               uiDefButF(block, NUMSLI, B_NODE_EXEC, "High ", 
-                       butr->xmin, butr->ymin+20.0, butr->xmax-butr->xmin, 20,
-                       &c->t1, 0.0f, 1.0f, 100, 0, "Values higher than this setting are 100% opaque");
-               uiDefButF(block, NUMSLI, B_NODE_EXEC, "Low ", 
-                       butr->xmin, butr->ymin, butr->xmax-butr->xmin, 20,
-                       &c->t2, 0.0f, 1.0f, 100, 0, "Values lower than this setting are 100% keyed");
-               uiBlockEndAlign(block);
+       col= uiLayoutColumn(layout, 0);
+       uiItemR(col, NULL, 0, ptr, "acceptance", 0);
+       uiItemR(col, NULL, 0, ptr, "cutoff", 0);
        
-               /*keep t2 (low) less than t1 (high) */
-               if(c->t2 > c->t1) {
-                       c->t2=c->t1;
-               }
-       }
-       return 80;
+       col= uiLayoutColumn(layout, 1);
+       uiItemR(col, NULL, 0, ptr, "lift", UI_ITEM_R_SLIDER);
+       uiItemR(col, NULL, 0, ptr, "gain", UI_ITEM_R_SLIDER);
+       uiItemR(col, NULL, 0, ptr, "shadow_adjust", UI_ITEM_R_SLIDER);
 }
 
-static int node_composit_buts_luma_matte(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+static void node_composit_buts_color_matte(uiLayout *layout, PointerRNA *ptr)
 {
-       if(block) {
-               NodeChroma *c=node->storage;
+       uiLayout *col;
        
-               /*tolerance sliders */
-               uiDefButF(block, NUMSLI, B_NODE_EXEC, "High ", 
-                       butr->xmin, butr->ymin+20.0, butr->xmax-butr->xmin, 20,
-                       &c->t1, 0.0f, 1.0f, 100, 0, "Values higher than this setting are 100% opaque");
-               uiDefButF(block, NUMSLI, B_NODE_EXEC, "Low ", 
-                       butr->xmin, butr->ymin, butr->xmax-butr->xmin, 20,
-                       &c->t2, 0.0f, 1.0f, 100, 0, "Values lower than this setting are 100% keyed");
-               uiBlockEndAlign(block);
+       col= uiLayoutColumn(layout, 1);
+       uiItemR(col, NULL, 0, ptr, "h", UI_ITEM_R_SLIDER);
+       uiItemR(col, NULL, 0, ptr, "s", UI_ITEM_R_SLIDER);
+       uiItemR(col, NULL, 0, ptr, "v", UI_ITEM_R_SLIDER);
+}
+
+static void node_composit_buts_channel_matte(uiLayout *layout, PointerRNA *ptr)
+{      
+       uiLayout *col, *row;
        
-               /*keep t2 (low) less than t1 (high) */
-               if(c->t2 > c->t1) {
-                       c->t2=c->t1;
-               }
+       uiBlock *block= uiLayoutAbsoluteBlock(layout);
+       bNode *node= ptr->data;
+       rctf *butr= &node->butr;
+       short sx= (butr->xmax-butr->xmin)/4;
+       short cx= (butr->xmax-butr->xmin)/3;
+       NodeChroma *c=node->storage;
+       char *c1, *c2, *c3;
+
+       /*color space selector*/
+       row= uiLayoutRow(layout, 0);
+       uiItemR(row, NULL, 0, ptr, "color_space", UI_ITEM_R_EXPAND);
+
+       if (node->custom1==1) {
+               c1="R"; c2="G"; c3="B";
+       }
+       else if(node->custom1==2){
+               c1="H"; c2="S"; c3="V";
+       }
+       else if(node->custom1==3){
+               c1="Y"; c2="U"; c3="V";
        }
-       return 40;
+       else { // if(node->custom1==4){
+               c1="Y"; c2="Cb"; c3="Cr";
+       }
+
+       /*channel selector */
+       row= uiLayoutRow(layout, 0);
+       uiBlockBeginAlign(block);
+       uiDefButS(block, ROW, B_NODE_EXEC, c1,
+               butr->xmin,butr->ymin+40,cx,20,&node->custom2,1, 1, 0, 0, "Channel 1");
+       uiDefButS(block, ROW, B_NODE_EXEC, c2,
+               butr->xmin+cx,butr->ymin+40,cx,20,&node->custom2,1, 2, 0, 0, "Channel 2");
+       uiDefButS(block, ROW, B_NODE_EXEC, c3,
+               butr->xmin+cx+cx,butr->ymin+40,cx,20,&node->custom2, 1, 3, 0, 0, "Channel 3");
+       uiBlockEndAlign(block);
+
+       /*tolerance sliders */
+       col =uiLayoutColumn(layout, 1);
+       uiItemR(col, NULL, 0, ptr, "high", UI_ITEM_R_SLIDER);
+       uiItemR(col, NULL, 0, ptr, "low", UI_ITEM_R_SLIDER);
+
 }
 
-static int node_composit_buts_map_uv(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+static void node_composit_buts_luma_matte(uiLayout *layout, PointerRNA *ptr)
 {
-       if(block) {
-               uiDefButS(block, NUM, B_NODE_EXEC, "Alpha:",
-                                 butr->xmin, butr->ymin, butr->xmax-butr->xmin, 20, 
-                                 &node->custom1, 0, 100, 0, 0, "Conversion percentage of UV differences to Alpha");
-       }
-       return 20;
+       uiLayout *col;
+       
+       col= uiLayoutColumn(layout, 1);
+       uiItemR(col, NULL, 0, ptr, "high", UI_ITEM_R_SLIDER);
+       uiItemR(col, NULL, 0, ptr, "low", UI_ITEM_R_SLIDER);
 }
 
-static int node_composit_buts_id_mask(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+static void node_composit_buts_map_uv(uiLayout *layout, PointerRNA *ptr)
 {
-       if(block) {
-               uiDefButS(block, NUM, B_NODE_EXEC, "ID:",
-                                 butr->xmin, butr->ymin, butr->xmax-butr->xmin, 20, 
-                                 &node->custom1, 0, 10000, 0, 0, "Pass Index number to convert to Alpha");
-       }
-       return 20;
+       uiItemR(layout, NULL, 0, ptr, "alpha", 0);
+}
+
+static void node_composit_buts_id_mask(uiLayout *layout, PointerRNA *ptr)
+{
+       uiBlock *block= uiLayoutAbsoluteBlock(layout);
+       bNode *node= ptr->data;
+       rctf *butr= &node->butr;
+
+       uiDefButS(block, NUM, B_NODE_EXEC, "ID:",
+                         butr->xmin, butr->ymin, butr->xmax-butr->xmin, 20, 
+                         &node->custom1, 0, 10000, 0, 0, "Pass Index number to convert to Alpha");
 }
 
 /* allocate sufficient! */
+/*
 static void node_imagetype_string(char *str)
 {
        str += sprintf(str, "Save Image as: %%t|");
@@ -1864,67 +1423,37 @@ static void node_imagetype_string(char *str)
        str += sprintf(str, "DPX %%x%d|", R_DPX);
        str += sprintf(str, "OpenEXR %%x%d", R_OPENEXR);
 }
+*/
 
-static void node_set_image_cb(bContext *C, void *ntree_v, void *node_v)
+/*static void node_set_image_cb(bContext *C, void *ntree_v, void *node_v)
 {
        bNodeTree *ntree= ntree_v;
        bNode *node= node_v;
        
        nodeSetActive(ntree, node);
 }
+*/
 
-static int node_composit_buts_file_output(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+static void node_composit_buts_file_output(uiLayout *layout, PointerRNA *ptr)
 {
-       if(block) {
-               NodeImageFile *nif= node->storage;
-               uiBut *bt;
-               short x= (short)butr->xmin;
-               short y= (short)butr->ymin;
-               short w= (short)butr->xmax-butr->xmin;
-               char str[320];
-               
-               node_imagetype_string(str);
-               
-               uiBlockBeginAlign(block);
-               
-               bt = uiDefIconBut(block, BUT, B_NODE_SETIMAGE, ICON_FILESEL,
-                                 x, y+60, 20, 20,
-                                 0, 0, 0, 0, 0, "Open Fileselect to get Backbuf image");
-               uiButSetFunc(bt, node_set_image_cb, ntree, node);
-               
-               uiDefBut(block, TEX, B_NOP, "",
-                                 20+x, y+60, w-20, 20, 
-                                 nif->name, 0.0f, 240.0f, 0, 0, "");
-               
-               uiDefButS(block, MENU, B_NOP, str,
-                                 x, y+40, w, 20, 
-                                 &nif->imtype, 0.0f, 1.0f, 0, 0, "");
-               
-               if(nif->imtype==R_OPENEXR) {
-                       uiDefButBitS(block, TOG, R_OPENEXR_HALF, B_REDR, "Half",        
-                                               x, y+20, w/2, 20, 
-                                               &nif->subimtype, 0, 0, 0, 0, "");
-
-                       uiDefButS(block, MENU,B_NOP, "Codec %t|None %x0|Pxr24 (lossy) %x1|ZIP (lossless) %x2|PIZ (lossless) %x3|RLE (lossless) %x4",  
-                                               x+w/2, y+20, w/2, 20, 
-                                               &nif->codec, 0, 0, 0, 0, "");
-               }
-               else {
-                       uiDefButS(block, NUM, B_NOP, "Quality: ",
-                                 x, y+20, w, 20, 
-                                 &nif->quality, 10.0f, 100.0f, 10, 0, "");
-               }
-               
-               /* start frame, end frame */
-               uiDefButI(block, NUM, B_NODE_EXEC, "SFra: ", 
-                                 x, y, w/2, 20, 
-                                 &nif->sfra, 1, MAXFRAMEF, 10, 0, "");
-               uiDefButI(block, NUM, B_NODE_EXEC, "EFra: ", 
-                                 x+w/2, y, w/2, 20, 
-                                 &nif->efra, 1, MAXFRAMEF, 10, 0, "");
-               
+       uiLayout *col, *row;
+
+       col= uiLayoutColumn(layout, 0);
+       uiItemR(col, "", 0, ptr, "filename", 0);
+       uiItemR(col, "", 0, ptr, "image_type", 0);
+       
+       row= uiLayoutRow(layout, 0);
+       if (RNA_enum_get(ptr, "image_type")== R_OPENEXR) {
+               uiItemR(row, NULL, 0, ptr, "exr_half", 0);
+               uiItemR(row, "", 0, ptr, "exr_codec", 0);
+       }
+       else if (RNA_enum_get(ptr, "image_type")== R_JPEG90) {
+               uiItemR(row, NULL, 0, ptr, "quality", UI_ITEM_R_SLIDER);
        }
-       return 80;
+       
+       row= uiLayoutRow(layout, 1);
+       uiItemR(row, "Start", 0, ptr, "start_frame", 0);
+       uiItemR(row, "End", 0, ptr, "end_frame", 0);
 }
 
 static void node_scale_cb(bContext *C, void *node_v, void *unused_v)
@@ -1945,43 +1474,34 @@ static void node_scale_cb(bContext *C, void *node_v, void *unused_v)
        }       
 }
 
-static int node_composit_buts_scale(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+static void node_composit_buts_scale(uiLayout *layout, PointerRNA *ptr)
 {
-       if(block) {
-               uiBut *bt= uiDefButS(block, MENU, B_NODE_EXEC, "Relative %x0|Absolute %x1|Scene Size % %x2|",
-                                 butr->xmin, butr->ymin, butr->xmax-butr->xmin, 20, 
-                                 &node->custom1, 0, 0, 0, 0, "Scale new image to absolute pixel size, size relative to the incoming image, or using the 'percent' size of the scene");
-               uiButSetFunc(bt, node_scale_cb, node, NULL);
-       }
-       return 20;
+       uiBlock *block= uiLayoutAbsoluteBlock(layout);
+       bNode *node= ptr->data;
+       rctf *butr= &node->butr;
+       uiBut *bt= uiDefButS(block, MENU, B_NODE_EXEC, "Relative %x0|Absolute %x1|Scene Size % %x2|",
+                         butr->xmin, butr->ymin, butr->xmax-butr->xmin, 20, 
+                         &node->custom1, 0, 0, 0, 0, "Scale new image to absolute pixel size, size relative to the incoming image, or using the 'percent' size of the scene");
+       uiButSetFunc(bt, node_scale_cb, node, NULL);
 }
 
-static int node_composit_buts_invert(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr) 
+static void node_composit_buts_invert(uiLayout *layout, PointerRNA *ptr)
 {
-       if(block) {
-               uiBlockBeginAlign(block);
-               uiDefButBitS(block, TOG, CMP_CHAN_RGB, B_NODE_EXEC, "RGB",
-                                        butr->xmin, butr->ymin, (butr->xmax-butr->xmin)/2, 20, 
-                                        &node->custom1, 0, 0, 0, 0, "");
-               uiDefButBitS(block, TOG, CMP_CHAN_A, B_NODE_EXEC, "A",
-                                        butr->xmin+(butr->xmax-butr->xmin)/2, butr->ymin, (butr->xmax-butr->xmin)/2, 20, 
-                                        &node->custom1, 0, 0, 0, 0, "");
-               uiBlockEndAlign(block);
-       }
-       return 20;      
+       uiLayout *col;
+       
+       col= uiLayoutColumn(layout, 0);
+       uiItemR(col, NULL, 0, ptr, "rgb", 0);
+       uiItemR(col, NULL, 0, ptr, "alpha", 0);
 }
 
-static int node_composit_buts_premulkey(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+static void node_composit_buts_premulkey(uiLayout *layout, PointerRNA *ptr)
 {
-       if(block) {
-               uiBut *bt;
-               
-               /* blend type */
-               bt=uiDefButS(block, MENU, B_NODE_EXEC, "Key to Premul %x0|Premul to Key %x1",
-                                        butr->xmin, butr->ymin, butr->xmax-butr->xmin, 20, 
-                                        &node->custom1, 0, 0, 0, 0, "Conversion between premultiplied alpha and key alpha");
-       }
-       return 20;
+       uiItemR(layout, "", 0, ptr, "mapping", 0);
+}
+
+static void node_composit_buts_view_levels(uiLayout *layout, PointerRNA *ptr)
+{
+       uiItemR(layout, NULL, 0, ptr, "color_space", UI_ITEM_R_EXPAND);
 }
 
 /* only once called */
@@ -1991,173 +1511,153 @@ static void node_composit_set_butfunc(bNodeType *ntype)
                /* case NODE_GROUP:      note, typeinfo for group is generated... see "XXX ugly hack" */
 
                case CMP_NODE_IMAGE:
-                       ntype->butfunc= node_composit_buts_image;
+                       ntype->uifunc= node_composit_buts_image;
                        break;
                case CMP_NODE_R_LAYERS:
-                       ntype->butfunc= node_composit_buts_renderlayers;
+                       ntype->uifunc= node_composit_buts_renderlayers;
                        break;
                case CMP_NODE_NORMAL:
-                       ntype->butfunc= node_buts_normal;
+                       ntype->uifunc= node_buts_normal;
                        break;
                case CMP_NODE_CURVE_VEC:
-                       ntype->butfunc= node_buts_curvevec;
+                       ntype->uifunc= node_buts_curvevec;
                        break;
                case CMP_NODE_CURVE_RGB:
-                       ntype->butfunc= node_buts_curvecol;
+                       ntype->uifunc= node_buts_curvecol;
                        break;
                case CMP_NODE_VALUE:
-                       ntype->butfunc= node_buts_value;
+                       ntype->uifunc= node_buts_value;
                        break;
                case CMP_NODE_RGB:
-                       ntype->butfunc= node_buts_rgb;
+                       ntype->uifunc= node_buts_rgb;
                        break;
                case CMP_NODE_FLIP:
-                       ntype->butfunc= node_composit_buts_flip;
+                       ntype->uifunc= node_composit_buts_flip;
                        break;
                case CMP_NODE_SPLITVIEWER:
-                       ntype->butfunc= node_composit_buts_splitviewer;
+                       ntype->uifunc= node_composit_buts_splitviewer;
                        break;
                case CMP_NODE_MIX_RGB:
-                       ntype->butfunc= node_buts_mix_rgb;
+                       ntype->uifunc= node_buts_mix_rgb;
                        break;
                case CMP_NODE_VALTORGB:
-                       ntype->butfunc= node_buts_valtorgb;
+                       ntype->uifunc= node_buts_valtorgb;
                        break;
                case CMP_NODE_CROP:
-                       ntype->butfunc= node_composit_buts_crop;
+                       ntype->uifunc= node_composit_buts_crop;
                        break;
                case CMP_NODE_BLUR:
-                       ntype->butfunc= node_composit_buts_blur;
+                       ntype->uifunc= node_composit_buts_blur;
                        break;
                case CMP_NODE_DBLUR:
-                       ntype->butfunc= node_composit_buts_dblur;
+                       ntype->uifunc= node_composit_buts_dblur;
                        break;
                case CMP_NODE_BILATERALBLUR:
-                       ntype->butfunc= node_composit_buts_bilateralblur;
+                       ntype->uifunc= node_composit_buts_bilateralblur;
                        break;
                /* qdn: defocus node */
                case CMP_NODE_DEFOCUS:
-                       ntype->butfunc = node_composit_buts_defocus;
+                       ntype->uifunc = node_composit_buts_defocus;
                        break;
                /* qdn: glare node */
                case CMP_NODE_GLARE:
-                       ntype->butfunc = node_composit_buts_glare;
+                       ntype->uifunc = node_composit_buts_glare;
                        break;
                /* qdn: tonemap node */
                case CMP_NODE_TONEMAP:
-                       ntype->butfunc = node_composit_buts_tonemap;
+                       ntype->uifunc = node_composit_buts_tonemap;
                        break;
                /* qdn: lens distortion node */
                case CMP_NODE_LENSDIST:
-                       ntype->butfunc = node_composit_buts_lensdist;
+                       ntype->uifunc = node_composit_buts_lensdist;
                        break;
                case CMP_NODE_VECBLUR:
-                       ntype->butfunc= node_composit_buts_vecblur;
+                       ntype->uifunc= node_composit_buts_vecblur;
                        break;
                case CMP_NODE_FILTER:
-                       ntype->butfunc= node_composit_buts_filter;
+                       ntype->uifunc= node_composit_buts_filter;
                        break;
                case CMP_NODE_MAP_VALUE:
-                       ntype->butfunc= node_composit_buts_map_value;
+                       ntype->uifunc= node_composit_buts_map_value;
                        break;
                case CMP_NODE_TIME:
-                       ntype->butfunc= node_buts_time;
+                       ntype->uifunc= node_buts_time;
                        break;
                case CMP_NODE_ALPHAOVER:
-                       ntype->butfunc= node_composit_buts_alphaover;
+                       ntype->uifunc= node_composit_buts_alphaover;
                        break;
                case CMP_NODE_HUE_SAT:
-                       ntype->butfunc= node_composit_buts_hue_sat;
+                       ntype->uifunc= node_composit_buts_hue_sat;
                        break;
                case CMP_NODE_TEXTURE:
-                       ntype->butfunc= node_buts_texture;
+                       ntype->uifunc= node_buts_texture;
                        break;
                case CMP_NODE_DILATEERODE:
-                       ntype->butfunc= node_composit_buts_dilateerode;
+                       ntype->uifunc= node_composit_buts_dilateerode;
                        break;
                case CMP_NODE_OUTPUT_FILE:
-                       ntype->butfunc= node_composit_buts_file_output;
-                       break;
-       
+                       ntype->uifunc= node_composit_buts_file_output;
+                       break;  
                case CMP_NODE_DIFF_MATTE:
-                       ntype->butfunc=node_composit_buts_diff_matte;
+                       ntype->uifunc=node_composit_buts_diff_matte;
+                       break;
+               case CMP_NODE_DIST_MATTE:
+                       ntype->uifunc=node_composit_buts_distance_matte;
                        break;
                case CMP_NODE_COLOR_SPILL:
-                       ntype->butfunc=node_composit_buts_color_spill;
+                       ntype->uifunc=node_composit_buts_color_spill;
                        break;
-               case CMP_NODE_CHROMA:
-                       ntype->butfunc=node_composit_buts_chroma_matte;
+               case CMP_NODE_CHROMA_MATTE:
+                       ntype->uifunc=node_composit_buts_chroma_matte;
+                       break;
+               case CMP_NODE_COLOR_MATTE:
+                       ntype->uifunc=node_composit_buts_color_matte;
                        break;
                case CMP_NODE_SCALE:
-                       ntype->butfunc= node_composit_buts_scale;
+                       ntype->uifunc= node_composit_buts_scale;
                        break;
                case CMP_NODE_CHANNEL_MATTE:
-                       ntype->butfunc= node_composit_buts_channel_matte;
+                       ntype->uifunc= node_composit_buts_channel_matte;
                        break;
                case CMP_NODE_LUMA_MATTE:
-                       ntype->butfunc= node_composit_buts_luma_matte;
+                       ntype->uifunc= node_composit_buts_luma_matte;
                        break;
                case CMP_NODE_MAP_UV:
-                       ntype->butfunc= node_composit_buts_map_uv;
+                       ntype->uifunc= node_composit_buts_map_uv;
                        break;
                case CMP_NODE_ID_MASK:
-                       ntype->butfunc= node_composit_buts_id_mask;
+                       ntype->uifunc= node_composit_buts_id_mask;
                        break;
                case CMP_NODE_MATH:
-                       ntype->butfunc= node_buts_math;
+                       ntype->uifunc= node_buts_math;
                        break;
                case CMP_NODE_INVERT:
-                       ntype->butfunc= node_composit_buts_invert;
+                       ntype->uifunc= node_composit_buts_invert;
                        break;
                case CMP_NODE_PREMULKEY:
-                       ntype->butfunc= node_composit_buts_premulkey;
+                       ntype->uifunc= node_composit_buts_premulkey;
                        break;
+      case CMP_NODE_VIEW_LEVELS:
+                       ntype->uifunc=node_composit_buts_view_levels;
+                       break;
                default:
-                       ntype->butfunc= NULL;
+                       ntype->uifunc= NULL;
        }
 }
 
 /* ****************** BUTTON CALLBACKS FOR TEXTURE NODES ***************** */
 
-static int node_texture_buts_bricks(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+static void node_texture_buts_bricks(uiLayout *layout, PointerRNA *ptr)
 {
-       if(block) {
-               short w = butr->xmax-butr->xmin;
-               short ofw = 32;
-               
-               uiBlockBeginAlign(block);
-               
-               /* Offset */
-               uiDefButF(
-                       block, NUM, B_NODE_EXEC, "Offset",
-                       butr->xmin, butr->ymin+20, w-ofw, 20,
-                       &node->custom3,
-                       0, 1, 0.25, 2,
-                       "Offset amount" );
-               uiDefButS(
-                       block, NUM, B_NODE_EXEC, "",
-                       butr->xmin+w-ofw, butr->ymin+20, ofw, 20,
-                       &node->custom1,
-                       2, 99, 0, 0,
-                       "Offset every N rows" );
-               
-               /* Squash */
-               uiDefButF(
-                       block, NUM, B_NODE_EXEC, "Squash",
-                       butr->xmin, butr->ymin+0, w-ofw, 20,
-                       &node->custom4,
-                       0, 99, 0.25, 2,
-                       "Stretch amount" );
-               uiDefButS(
-                       block, NUM, B_NODE_EXEC, "",
-                       butr->xmin+w-ofw, butr->ymin+0, ofw, 20,
-                       &node->custom2,
-                       2, 99, 0, 0,
-                       "Stretch every N rows" );
-               
-               uiBlockEndAlign(block);
-       }
-       return 40;
+       uiLayout *col;
+       
+       col= uiLayoutColumn(layout, 1);
+       uiItemR(col, "Offset", 0, ptr, "offset", 0);
+       uiItemR(col, "Frequency", 0, ptr, "offset_frequency", 0);
+       
+       col= uiLayoutColumn(layout, 1);
+       uiItemR(col, "Squash", 0, ptr, "squash", 0);
+       uiItemR(col, "Frequency", 0, ptr, "squash_frequency", 0);
 }
 
 /* Copied from buttons_shading.c -- needs unifying */
@@ -2168,210 +1668,175 @@ static char* noisebasis_menu()
        return nbmenu;
 }
 
-static int node_texture_buts_proc(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+static void node_texture_buts_proc(uiLayout *layout, PointerRNA *ptr)
 {
+       uiBlock *block= uiLayoutAbsoluteBlock(layout);
+       bNode *node= ptr->data;
+       rctf *butr= &node->butr;
        Tex *tex = (Tex *)node->storage;
        short x,y,w,h;
        
-       if( block ) {
-               x = butr->xmin;
-               y = butr->ymin;
-               w = butr->xmax - x;
-               h = butr->ymax - y;
-       }
-       else
-               return 0;
+       x = butr->xmin;
+       y = butr->ymin;
+       w = butr->xmax - x;
+       h = butr->ymax - y;
        
        switch( tex->type ) {
                case TEX_BLEND:
-                       if( block ) {
-                               uiBlockBeginAlign( block );
-                               uiDefButS( block, MENU, B_NODE_EXEC,
-                                       "Linear %x0|Quad %x1|Ease %x2|Diag %x3|Sphere %x4|Halo %x5|Radial %x6",
-                                       x, y+20, w, 20, &tex->stype, 0, 1, 0, 0, "Blend Type" );
-                               uiDefButBitS(block, TOG, TEX_FLIPBLEND, B_NODE_EXEC, "Flip XY", x, y, w, 20,
-                                       &tex->flag, 0, 0, 0, 0, "Flips the direction of the progression 90 degrees");
-                               uiBlockEndAlign( block );
-                       }
-                       return 40;
-                       
+                       uiBlockBeginAlign( block );
+                       uiDefButS( block, MENU, B_NODE_EXEC,
+                               "Linear %x0|Quad %x1|Ease %x2|Diag %x3|Sphere %x4|Halo %x5|Radial %x6",
+                               x, y+20, w, 20, &tex->stype, 0, 1, 0, 0, "Blend Type" );
+                       uiDefButBitS(block, TOG, TEX_FLIPBLEND, B_NODE_EXEC, "Flip XY", x, y, w, 20,
+                               &tex->flag, 0, 0, 0, 0, "Flips the direction of the progression 90 degrees");
+                       uiBlockEndAlign( block );
+                       break;
                        
                case TEX_MARBLE:
-                       if( block ) {
-                               uiBlockBeginAlign(block);
+                       uiBlockBeginAlign(block);
+               
+                       uiDefButS(block, ROW, B_NODE_EXEC, "Soft",       0*w/3+x, 40+y, w/3, 18, &tex->stype, 2.0, (float)TEX_SOFT, 0, 0, "Uses soft marble"); 
+                       uiDefButS(block, ROW, B_NODE_EXEC, "Sharp",      1*w/3+x, 40+y, w/3, 18, &tex->stype, 2.0, (float)TEX_SHARP, 0, 0, "Uses more clearly defined marble"); 
+                       uiDefButS(block, ROW, B_NODE_EXEC, "Sharper",    2*w/3+x, 40+y, w/3, 18, &tex->stype, 2.0, (float)TEX_SHARPER, 0, 0, "Uses very clearly defined marble"); 
                        
-                               uiDefButS(block, ROW, B_NODE_EXEC, "Soft",       0*w/3+x, 40+y, w/3, 18, &tex->stype, 2.0, (float)TEX_SOFT, 0, 0, "Uses soft marble"); 
-                               uiDefButS(block, ROW, B_NODE_EXEC, "Sharp",      1*w/3+x, 40+y, w/3, 18, &tex->stype, 2.0, (float)TEX_SHARP, 0, 0, "Uses more clearly defined marble"); 
-                               uiDefButS(block, ROW, B_NODE_EXEC, "Sharper",    2*w/3+x, 40+y, w/3, 18, &tex->stype, 2.0, (float)TEX_SHARPER, 0, 0, "Uses very clearly defined marble"); 
-                               
-                               uiDefButS(block, ROW, B_NODE_EXEC, "Soft noise", 0*w/2+x, 20+y, w/2, 19, &tex->noisetype, 12.0, (float)TEX_NOISESOFT, 0, 0, "Generates soft noise");
-                               uiDefButS(block, ROW, B_NODE_EXEC, "Hard noise", 1*w/2+x, 20+y, w/2, 19, &tex->noisetype, 12.0, (float)TEX_NOISEPERL, 0, 0, "Generates hard noise");
-                               
-                               uiDefButS(block, ROW, B_NODE_EXEC, "Sin",        0*w/3+x,  0+y, w/3, 18, &tex->noisebasis2, 8.0, 0.0, 0, 0, "Uses a sine wave to produce bands."); 
-                               uiDefButS(block, ROW, B_NODE_EXEC, "Saw",        1*w/3+x,  0+y, w/3, 18, &tex->noisebasis2, 8.0, 1.0, 0, 0, "Uses a saw wave to produce bands"); 
-                               uiDefButS(block, ROW, B_NODE_EXEC, "Tri",        2*w/3+x,  0+y, w/3, 18, &tex->noisebasis2, 8.0, 2.0, 0, 0, "Uses a triangle wave to produce bands"); 
-            
-                               uiBlockEndAlign(block);
-                       }
-                       return 60;
+                       uiDefButS(block, ROW, B_NODE_EXEC, "Soft noise", 0*w/2+x, 20+y, w/2, 19, &tex->noisetype, 12.0, (float)TEX_NOISESOFT, 0, 0, "Generates soft noise");
+                       uiDefButS(block, ROW, B_NODE_EXEC, "Hard noise", 1*w/2+x, 20+y, w/2, 19, &tex->noisetype, 12.0, (float)TEX_NOISEPERL, 0, 0, "Generates hard noise");
+                       
+                       uiDefButS(block, ROW, B_NODE_EXEC, "Sin",        0*w/3+x,  0+y, w/3, 18, &tex->noisebasis2, 8.0, 0.0, 0, 0, "Uses a sine wave to produce bands."); 
+                       uiDefButS(block, ROW, B_NODE_EXEC, "Saw",        1*w/3+x,  0+y, w/3, 18, &tex->noisebasis2, 8.0, 1.0, 0, 0, "Uses a saw wave to produce bands"); 
+                       uiDefButS(block, ROW, B_NODE_EXEC, "Tri",        2*w/3+x,  0+y, w/3, 18, &tex->noisebasis2, 8.0, 2.0, 0, 0, "Uses a triangle wave to produce bands"); 
+               
+                       uiBlockEndAlign(block);
+                       break;
                        
                case TEX_WOOD:
-                       if( block ) {
-                               uiDefButS(block, MENU, B_TEXPRV, noisebasis_menu(), x, y+64, w, 18, &tex->noisebasis, 0,0,0,0, "Sets the noise basis used for turbulence");
-                               
-                               uiBlockBeginAlign(block);
-                               uiDefButS(block, ROW, B_TEXPRV,             "Bands",     x,  40+y, w/2, 18, &tex->stype, 2.0, (float)TEX_BANDNOISE, 0, 0, "Uses standard noise"); 
-                               uiDefButS(block, ROW, B_TEXPRV,             "Rings", w/2+x,  40+y, w/2, 18, &tex->stype, 2.0, (float)TEX_RINGNOISE, 0, 0, "Lets Noise return RGB value"); 
-                               
-                               uiDefButS(block, ROW, B_NODE_EXEC, "Sin", 0*w/3+x,  20+y, w/3, 18, &tex->noisebasis2, 8.0, (float)TEX_SIN, 0, 0, "Uses a sine wave to produce bands."); 
-                               uiDefButS(block, ROW, B_NODE_EXEC, "Saw", 1*w/3+x,  20+y, w/3, 18, &tex->noisebasis2, 8.0, (float)TEX_SAW, 0, 0, "Uses a saw wave to produce bands"); 
-                               uiDefButS(block, ROW, B_NODE_EXEC, "Tri", 2*w/3+x,  20+y, w/3, 18, &tex->noisebasis2, 8.0, (float)TEX_TRI, 0, 0, "Uses a triangle wave to produce bands");
-                               
-                               uiDefButS(block, ROW, B_NODE_EXEC, "Soft noise", 0*w/2+x, 0+y, w/2, 19, &tex->noisetype, 12.0, (float)TEX_NOISESOFT, 0, 0, "Generates soft noise");
-                               uiDefButS(block, ROW, B_NODE_EXEC, "Hard noise", 1*w/2+x, 0+y, w/2, 19, &tex->noisetype, 12.0, (float)TEX_NOISEPERL, 0, 0, "Generates hard noise");
-                               uiBlockEndAlign(block);
-                       }
-                       return 80; 
+                       uiDefButS(block, MENU, B_TEXPRV, noisebasis_menu(), x, y+64, w, 18, &tex->noisebasis, 0,0,0,0, "Sets the noise basis used for turbulence");
+                       
+                       uiBlockBeginAlign(block);
+                       uiDefButS(block, ROW, B_TEXPRV,             "Bands",     x,  40+y, w/2, 18, &tex->stype, 2.0, (float)TEX_BANDNOISE, 0, 0, "Uses standard noise"); 
+                       uiDefButS(block, ROW, B_TEXPRV,             "Rings", w/2+x,  40+y, w/2, 18, &tex->stype, 2.0, (float)TEX_RINGNOISE, 0, 0, "Lets Noise return RGB value"); 
+                       
+                       uiDefButS(block, ROW, B_NODE_EXEC, "Sin", 0*w/3+x,  20+y, w/3, 18, &tex->noisebasis2, 8.0, (float)TEX_SIN, 0, 0, "Uses a sine wave to produce bands."); 
+                       uiDefButS(block, ROW, B_NODE_EXEC, "Saw", 1*w/3+x,  20+y, w/3, 18, &tex->noisebasis2, 8.0, (float)TEX_SAW, 0, 0, "Uses a saw wave to produce bands"); 
+                       uiDefButS(block, ROW, B_NODE_EXEC, "Tri", 2*w/3+x,  20+y, w/3, 18, &tex->noisebasis2, 8.0, (float)TEX_TRI, 0, 0, "Uses a triangle wave to produce bands");
+                       
+                       uiDefButS(block, ROW, B_NODE_EXEC, "Soft noise", 0*w/2+x, 0+y, w/2, 19, &tex->noisetype, 12.0, (float)TEX_NOISESOFT, 0, 0, "Generates soft noise");
+                       uiDefButS(block, ROW, B_NODE_EXEC, "Hard noise", 1*w/2+x, 0+y, w/2, 19, &tex->noisetype, 12.0, (float)TEX_NOISEPERL, 0, 0, "Generates hard noise");
+                       uiBlockEndAlign(block);
+                       break;
                        
                case TEX_CLOUDS:
-                       if( block ) {
-                               uiDefButS(block, MENU, B_TEXPRV, noisebasis_menu(), x, y+60, w, 18, &tex->noisebasis, 0,0,0,0, "Sets the noise basis used for turbulence");
-                               
-                               uiBlockBeginAlign(block);
-                               uiDefButS(block, ROW, B_TEXPRV, "B/W",       x, y+38, w/2, 18, &tex->stype, 2.0, (float)TEX_DEFAULT, 0, 0, "Uses standard noise"); 
-                               uiDefButS(block, ROW, B_TEXPRV, "Color", w/2+x, y+38, w/2, 18, &tex->stype, 2.0, (float)TEX_COLOR, 0, 0, "Lets Noise return RGB value"); 
-                               uiDefButS(block, ROW, B_TEXPRV, "Soft",      x, y+20, w/2, 18, &tex->noisetype, 12.0, (float)TEX_NOISESOFT, 0, 0, "Generates soft noise");
-                               uiDefButS(block, ROW, B_TEXPRV, "Hard",  w/2+x, y+20, w/2, 18, &tex->noisetype, 12.0, (float)TEX_NOISEPERL, 0, 0, "Generates hard noise");
-                               uiBlockEndAlign(block);
-                               
-                               uiDefButS(block, NUM, B_TEXPRV, "Depth:", x, y, w, 18, &tex->noisedepth, 0.0, 6.0, 0, 0, "Sets the depth of the cloud calculation");
-                       }
-                       return 80;
+                       uiDefButS(block, MENU, B_TEXPRV, noisebasis_menu(), x, y+60, w, 18, &tex->noisebasis, 0,0,0,0, "Sets the noise basis used for turbulence");
+                       
+                       uiBlockBeginAlign(block);
+                       uiDefButS(block, ROW, B_TEXPRV, "B/W",       x, y+38, w/2, 18, &tex->stype, 2.0, (float)TEX_DEFAULT, 0, 0, "Uses standard noise"); 
+                       uiDefButS(block, ROW, B_TEXPRV, "Color", w/2+x, y+38, w/2, 18, &tex->stype, 2.0, (float)TEX_COLOR, 0, 0, "Lets Noise return RGB value"); 
+                       uiDefButS(block, ROW, B_TEXPRV, "Soft",      x, y+20, w/2, 18, &tex->noisetype, 12.0, (float)TEX_NOISESOFT, 0, 0, "Generates soft noise");
+                       uiDefButS(block, ROW, B_TEXPRV, "Hard",  w/2+x, y+20, w/2, 18, &tex->noisetype, 12.0, (float)TEX_NOISEPERL, 0, 0, "Generates hard noise");
+                       uiBlockEndAlign(block);
+                       
+                       uiDefButS(block, NUM, B_TEXPRV, "Depth:", x, y, w, 18, &tex->noisedepth, 0.0, 6.0, 0, 0, "Sets the depth of the cloud calculation");
+                       break;
                        
                case TEX_DISTNOISE:
-                       if( block ) {
-                               uiBlockBeginAlign(block);
-                               uiDefButS(block, MENU, B_TEXPRV, noisebasis_menu(), x, y+18, w, 18, &tex->noisebasis2, 0,0,0,0, "Sets the noise basis to distort");
-                               uiDefButS(block, MENU, B_TEXPRV, noisebasis_menu(), x, y,    w, 18, &tex->noisebasis,  0,0,0,0, "Sets the noise basis which does the distortion");
-                               uiBlockEndAlign(block);
-                       }
-                       return 36;
+                       uiBlockBeginAlign(block);
+                       uiDefButS(block, MENU, B_TEXPRV, noisebasis_menu(), x, y+18, w, 18, &tex->noisebasis2, 0,0,0,0, "Sets the noise basis to distort");
+                       uiDefButS(block, MENU, B_TEXPRV, noisebasis_menu(), x, y,    w, 18, &tex->noisebasis,  0,0,0,0, "Sets the noise basis which does the distortion");
+                       uiBlockEndAlign(block);
+                       break;
        }
-       return 0;
 }
 
-static int node_texture_buts_image(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+static void node_texture_buts_image(uiLayout *layout, PointerRNA *ptr)
 {
+       uiBlock *block= uiLayoutAbsoluteBlock(layout);
+       bNode *node= ptr->data;
+       bNodeTree *ntree= ptr->id.data;
+       rctf *butr= &node->butr;
        char *strp;
        uiBut *bt;
+
+       uiBlockBeginAlign(block);
        
-       if( block ) {
-               uiBlockBeginAlign(block);
-               uiBlockSetCol(block, TH_BUT_SETTING2);
-               
-               /* browse button */
-               IMAnames_to_pupstring(&strp, NULL, "LOAD NEW %x32767", &(G.main->image), NULL, NULL);
-               node->menunr= 0;
-               bt= uiDefButS(block, MENU, B_NOP, strp, 
-                                         butr->xmin, butr->ymin, 19, 19, 
-                                         &node->menunr, 0, 0, 0, 0, "Browses existing choices");
-               uiButSetFunc(bt, node_browse_image_cb, ntree, node);
-               if(strp) MEM_freeN(strp);
+       /* browse button */
+       IMAnames_to_pupstring(&strp, NULL, "LOAD NEW %x32767", &(G.main->image), NULL, NULL);
+       node->menunr= 0;
+       bt= uiDefButS(block, MENU, B_NOP, strp, 
+                                 butr->xmin, butr->ymin, 19, 19, 
+                                 &node->menunr, 0, 0, 0, 0, "Browses existing choices");
+       uiButSetFunc(bt, node_browse_image_cb, ntree, node);
+       if(strp) MEM_freeN(strp);
+       
+       /* Add New button */
+       if(node->id==NULL) {
+               bt= uiDefBut(block, BUT, B_NODE_LOADIMAGE, "Load New",
+                                        butr->xmin+19, butr->ymin, (short)(butr->xmax-butr->xmin-19.0f), 19, 
+                                        NULL, 0.0, 0.0, 0, 0, "Add new Image");
+               uiButSetFunc(bt, node_active_cb, ntree, node);
+       }
+       else {
+               /* name button */
+               short xmin= (short)butr->xmin, xmax= (short)butr->xmax;
+               short width= xmax - xmin - 19;
                
-               /* Add New button */
-               if(node->id==NULL) {
-                       bt= uiDefBut(block, BUT, B_NODE_LOADIMAGE, "Load New",
-                                                butr->xmin+19, butr->ymin, (short)(butr->xmax-butr->xmin-19.0f), 19, 
-                                                NULL, 0.0, 0.0, 0, 0, "Add new Image");
-                       uiButSetFunc(bt, node_active_cb, ntree, node);
-                       uiBlockSetCol(block, TH_AUTO);
-               }
-               else {
-                       /* name button */
-                       short xmin= (short)butr->xmin, xmax= (short)butr->xmax;
-                       short width= xmax - xmin - 19;
-                       
-                       bt= uiDefBut(block, TEX, B_NOP, "IM:",
-                                                xmin+19, butr->ymin, width, 19, 
-                                                node->id->name+2, 0.0, 19.0, 0, 0, "Image name");
-                       uiButSetFunc(bt, node_ID_title_cb, node, NULL);
-               }
+               bt= uiDefBut(block, TEX, B_NOP, "IM:",
+                                        xmin+19, butr->ymin, width, 19, 
+                                        node->id->name+2, 0.0, 19.0, 0, 0, "Image name");
+               uiButSetFunc(bt, node_ID_title_cb, node, NULL);
        }
-       return 20;
 }
 
-static int node_texture_buts_output(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+static void node_texture_buts_output(uiLayout *layout, PointerRNA *ptr)
 {
-       if( block ) {
-               uiBut *bt;
-               short width;
-               char *name = ((TexNodeOutput*)node->storage)->name;
-               
-               uiBlockBeginAlign(block);
-               
-               width = (short)(butr->xmax - butr->xmin);
-               
-               bt = uiDefBut(
-                       block, TEX, B_NOP,
-                       "Name:",
-                       butr->xmin, butr->ymin,
-                       width, 19, 
-                       name, 0, 31,
-                       0, 0, 
-                       "Name this output"
-               );
-               
-               uiBlockEndAlign(block);
-       }
-       return 19;
+       uiItemR(layout, "", 0, ptr, "output_name", 0);
 }
 
 /* only once called */
 static void node_texture_set_butfunc(bNodeType *ntype)
 {
        if( ntype->type >= TEX_NODE_PROC && ntype->type < TEX_NODE_PROC_MAX ) {
-               ntype->butfunc = node_texture_buts_proc;
+               ntype->uifunc = node_texture_buts_proc;
        }
        else switch(ntype->type) {
                
                case TEX_NODE_MATH:
-                       ntype->butfunc = node_buts_math;
+                       ntype->uifunc = node_buts_math;
                        break;
                
                case TEX_NODE_MIX_RGB:
-                       ntype->butfunc = node_buts_mix_rgb;
+                       ntype->uifunc = node_buts_mix_rgb;
                        break;
                        
                case TEX_NODE_VALTORGB:
-                       ntype->butfunc = node_buts_valtorgb;
+                       ntype->uifunc = node_buts_valtorgb;
                        break;
                        
                case TEX_NODE_CURVE_RGB:
-                       ntype->butfunc= node_buts_curvecol;
+                       ntype->uifunc= node_buts_curvecol;
                        break;
                        
                case TEX_NODE_CURVE_TIME:
-                       ntype->butfunc = node_buts_time;
+                       ntype->uifunc = node_buts_time;
                        break;
                        
                case TEX_NODE_TEXTURE:
-                       ntype->butfunc = node_buts_texture;
+                       ntype->uifunc = node_buts_texture;
                        break;
                        
                case TEX_NODE_BRICKS:
-                       ntype->butfunc = node_texture_buts_bricks;
+                       ntype->uifunc = node_texture_buts_bricks;
                        break;
                        
                case TEX_NODE_IMAGE:
-                       ntype->butfunc = node_texture_buts_image;
+                       ntype->uifunc = node_texture_buts_image;
                        break;
                        
                case TEX_NODE_OUTPUT:
-                       ntype->butfunc = node_texture_buts_output;
+                       ntype->uifunc = node_texture_buts_output;
                        break;
                        
                default:
-                       ntype->butfunc= NULL;
+                       ntype->uifunc= NULL;
        }
 }
 
@@ -2443,14 +1908,18 @@ void node_rename_but(char *s)
 
 #endif
 
-void draw_nodespace_back_pix(ARegion *ar, SpaceNode *snode)
+void draw_nodespace_back_pix(ARegion *ar, SpaceNode *snode, int color_manage)
 {
        
        if((snode->flag & SNODE_BACKDRAW) && snode->treetype==NTREE_COMPOSIT) {
                Image *ima= BKE_image_verify_viewer(IMA_TYPE_COMPOSITE, "Viewer Node");
-               ImBuf *ibuf= BKE_image_get_ibuf(ima, NULL);
+               void *lock;
+               ImBuf *ibuf= BKE_image_acquire_ibuf(ima, NULL, &lock);
                if(ibuf) {
                        float x, y; 
+                       
+                       wmPushMatrix();
+                       
                        /* somehow the offset has to be calculated inverse */
                        
                        glaDefine2DArea(&ar->winrct);
@@ -2460,15 +1929,21 @@ void draw_nodespace_back_pix(ARegion *ar, SpaceNode *snode)
                        x = (ar->winx-ibuf->x)/2 + snode->xof;
                        y = (ar->winy-ibuf->y)/2 + snode->yof;
                        
+                       if(!ibuf->rect) {
+                               if(color_manage)
+                                       ibuf->profile= IB_PROFILE_SRGB;
+                               else
+                                       ibuf->profile = IB_PROFILE_NONE;
+                               IMB_rect_from_float(ibuf);
+                       }
+
                        if(ibuf->rect)
                                glaDrawPixelsSafe(x, y, ibuf->x, ibuf->y, ibuf->x, GL_RGBA, GL_UNSIGNED_BYTE, ibuf->rect);
-                       else if(ibuf->channels==4)
-                               glaDrawPixelsSafe(x, y, ibuf->x, ibuf->y, ibuf->x, GL_RGBA, GL_FLOAT, ibuf->rect_float);
                        
-                       /* sort this out, this should not be needed */
-                       wmOrtho2(ar->v2d.cur.xmin, ar->v2d.cur.xmax, ar->v2d.cur.ymin, ar->v2d.cur.ymax);
-                       glLoadIdentity();
+                       wmPopMatrix();
                }
+
+               BKE_image_release_ibuf(ima, lock);
        }
 }
 
@@ -2561,8 +2036,8 @@ int node_link_bezier_points(View2D *v2d, SpaceNode *snode, bNodeLink *link, floa
        else {
                
                /* always do all three, to prevent data hanging around */
-               forward_diff_bezier(vec[0][0], vec[1][0], vec[2][0], vec[3][0], coord_array[0], resol, 2);
-               forward_diff_bezier(vec[0][1], vec[1][1], vec[2][1], vec[3][1], coord_array[0]+1, resol, 2);
+               forward_diff_bezier(vec[0][0], vec[1][0], vec[2][0], vec[3][0], coord_array[0], resol, sizeof(float)*2);
+               forward_diff_bezier(vec[0][1], vec[1][1], vec[2][1], vec[3][1], coord_array[0]+1, resol, sizeof(float)*2);
                
                return 1;
        }
@@ -2635,66 +2110,4 @@ void node_draw_link(View2D *v2d, SpaceNode *snode, bNodeLink *link)
        node_draw_link_bezier(v2d, snode, link, th_col1, th_col2, do_shaded);
 }
 
-#if 0
-
-static void nodes_panel_gpencil(short cntrl)   // NODES_HANDLER_GREASEPENCIL
-{
-       uiBlock *block;
-       SpaceNode *snode;
-       
-       snode= curarea->spacedata.first;
-
-       block= uiNewBlock(&curarea->uiblocks, "nodes_panel_gpencil", UI_EMBOSS, UI_HELV, curarea->win);
-       uiPanelControl(UI_PNL_SOLID | UI_PNL_CLOSE  | cntrl);
-       uiSetPanelHandler(NODES_HANDLER_GREASEPENCIL);  // for close and esc
-       if (uiNewPanel(curarea, block, "Grease Pencil", "SpaceNode", 100, 30, 318, 204)==0) return;
-       
-       /* we can only really draw stuff if there are nodes (otherwise no events are handled */
-       if (snode->nodetree == NULL)
-               return;
-       
-       /* allocate memory for gpd if drawing enabled (this must be done first or else we crash) */
-       if (snode->flag & SNODE_DISPGP) {
-               if (snode->gpd == NULL)
-                       gpencil_data_setactive(curarea, gpencil_data_addnew());
-       }
-       
-       if (snode->flag & SNODE_DISPGP) {
-               bGPdata *gpd= snode->gpd;
-               short newheight;
-               
-               /* this is a variable height panel, newpanel doesnt force new size on existing panels */
-               /* so first we make it default height */
-               uiNewPanelHeight(block, 204);
-               
-               /* draw button for showing gpencil settings and drawings */
-               uiDefButBitS(block, TOG, SNODE_DISPGP, B_REDR, "Use Grease Pencil", 10, 225, 150, 20, &snode->flag, 0, 0, 0, 0, "Display freehand annotations overlay over this Node Editor (draw using Shift-LMB)");
-               
-               /* extend the panel if the contents won't fit */
-               newheight= draw_gpencil_panel(block, gpd, curarea); 
-               uiNewPanelHeight(block, newheight);
-       }
-       else {
-               uiDefButBitS(block, TOG, SNODE_DISPGP, B_REDR, "Use Grease Pencil", 10, 225, 150, 20, &snode->flag, 0, 0, 0, 0, "Display freehand annotations overlay over this Node Editor");
-               uiDefBut(block, LABEL, 1, " ",  160, 180, 150, 20, NULL, 0.0, 0.0, 0, 0, "");
-       }
-}
 
-static void nodes_blockhandlers(ScrArea *sa)
-{
-       SpaceNode *snode= sa->spacedata.first;
-       short a;
-       
-       for(a=0; a<SPACE_MAXHANDLER; a+=2) {
-               switch(snode->blockhandler[a]) {
-                       case NODES_HANDLER_GREASEPENCIL:
-                               nodes_panel_gpencil(snode->blockhandler[a+1]);
-                               break;
-               }
-               
-               /* clear action value for event */
-               snode->blockhandler[a+1]= 0;
-       }
-       uiDrawBlocksPanels(sa, 0);
-}
-#endif