2.5 - node editor

Commit of WIP code (what code isn't wip, these days ;)
- only drawing code as basis to work further from (and have less conflicts between different systems I work on)

8 files changed, 6669 insertions, 27 deletions

diff --git a/source/blender/editors/include/BIF_glutil.h b/source/blender/editors/include/BIF_glutil.h
index 0d34c122392..63bd451132d 100644
--- a/source/blender/editors/include/BIF_glutil.h
+++ b/source/blender/editors/include/BIF_glutil.h
@@ -31,6 +31,7 @@
 struct rcti;
 struct rctf;
 
+void fdrawbezier(float vec[4][3]);
 void fdrawline(float x1, float y1, float x2, float y2);
 void fdrawbox(float x1, float y1, float x2, float y2);
 void sdrawline(short x1, short y1, short x2, short y2);
diff --git a/source/blender/editors/screen/glutil.c b/source/blender/editors/screen/glutil.c
index bead9a6399f..96cc99351fd 100644
--- a/source/blender/editors/screen/glutil.c
+++ b/source/blender/editors/screen/glutil.c
@@ -49,6 +49,34 @@
 
 /* ******************************************** */
 
+void fdrawbezier(float vec[4][3])
+{
+	float dist;
+	float curve_res = 24, spline_step = 0.0f;
+	
+	dist= 0.5f*ABS(vec[0][0] - vec[3][0]);
+	
+	/* check direction later, for top sockets */
+	vec[1][0]= vec[0][0]+dist;
+	vec[1][1]= vec[0][1];
+	
+	vec[2][0]= vec[3][0]-dist;
+	vec[2][1]= vec[3][1];
+	/* we can reuse the dist variable here to increment the GL curve eval amount*/
+	dist = 1.0f/curve_res;
+	
+	cpack(0x0);
+	glMap1f(GL_MAP1_VERTEX_3, 0.0, 1.0, 3, 4, vec[0]);
+	glBegin(GL_LINE_STRIP);
+	while (spline_step < 1.000001f) {
+		/*if(do_shaded)
+			UI_ThemeColorBlend(th_col1, th_col2, spline_step);*/
+		glEvalCoord1f(spline_step);
+		spline_step += dist;
+	}
+	glEnd();
+}
+
 void fdrawline(float x1, float y1, float x2, float y2)
 {
 	float v[2];
diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c
new file mode 100644
index 00000000000..18d9ee44e84
--- /dev/null
+++ b/source/blender/editors/space_node/drawnode.c
@@ -0,0 +1,2759 @@
+/**
+ * $Id$
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version. 
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * The Original Code is Copyright (C) 2005 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): David Millan Escriva, Juho Vepsäläinen
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include <math.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "BLI_blenlib.h"
+#include "BLI_arithb.h"
+
+#include "DNA_ID.h"
+#include "DNA_node_types.h"
+#include "DNA_image_types.h"
+#include "DNA_material_types.h"
+#include "DNA_mesh_types.h"
+#include "DNA_action_types.h"
+#include "DNA_color_types.h"
+#include "DNA_customdata_types.h"
+#include "DNA_gpencil_types.h"
+#include "DNA_ipo_types.h"
+#include "DNA_object_types.h"
+#include "DNA_scene_types.h"
+#include "DNA_space_types.h"
+#include "DNA_screen_types.h"
+#include "DNA_texture_types.h"
+#include "DNA_text_types.h"
+#include "DNA_userdef_types.h"
+
+#include "BKE_global.h"
+#include "BKE_image.h"
+#include "BKE_library.h"
+#include "BKE_main.h"
+#include "BKE_material.h"
+#include "BKE_node.h"
+#include "BKE_object.h"
+#include "BKE_texture.h"
+#include "BKE_text.h"
+#include "BKE_utildefines.h"
+
+#include "CMP_node.h"
+#include "SHD_node.h"
+
+/* #include "BDR_gpencil.h" XXX */
+
+#include "BIF_gl.h"
+#include "BIF_glutil.h"
+/*
+#include "BIF_drawgpencil.h"
+#include "BIF_interface.h"
+#include "BIF_interface_icons.h"
+#include "BIF_language.h"
+#include "BIF_mywindow.h"
+#include "BIF_previewrender.h"
+#include "BIF_resources.h"
+#include "BIF_screen.h"
+#include "BIF_space.h"
+*/
+
+/* XXX
+#include "BSE_drawipo.h"
+#include "BSE_node.h"
+#include "BSE_view.h"
+*/
+
+
+#include "BMF_Api.h"
+
+#include "MEM_guardedalloc.h"
+
+#include "UI_text.h"
+#include "UI_interface.h"
+#include "UI_resources.h"
+
+/*
+#include "RE_pipeline.h"
+#include "IMB_imbuf_types.h"*/
+
+/*#include "blendef.h"
+#include "butspace.h"*/
+/*#include "interface.h"*/	/* urm...  for rasterpos_safe, roundbox */
+/*#include "mydevice.h"*/
+#if 0
+//extern void autocomplete_uv(char *str, void *arg_v);
+extern int verify_valid_uv_name(char *str);
+
+/* autocomplete callback for buttons */
+static void autocomplete_vcol(char *str, void *arg_v)
+{
+	Mesh *me;
+	CustomDataLayer *layer;
+	AutoComplete *autocpl;
+	int a;
+
+	if(str[0]==0)
+		return;
+
+	autocpl= autocomplete_begin(str, 32);
+		
+	/* search if str matches the beginning of name */
+	for(me= G.main->mesh.first; me; me=me->id.next)
+		for(a=0, layer= me->fdata.layers; a<me->fdata.totlayer; a++, layer++)
+			if(layer->type == CD_MCOL)
+				autocomplete_do_name(autocpl, layer->name);
+	
+	autocomplete_end(autocpl, str);
+}
+
+static int verify_valid_vcol_name(char *str)
+{
+	Mesh *me;
+	CustomDataLayer *layer;
+	int a;
+	
+	if(str[0]==0)
+		return 1;
+
+	/* search if str matches the name */
+	for(me= G.main->mesh.first; me; me=me->id.next)
+		for(a=0, layer= me->fdata.layers; a<me->fdata.totlayer; a++, layer++)
+			if(layer->type == CD_MCOL)
+				if(strcmp(layer->name, str)==0)
+					return 1;
+	
+	return 0;
+}
+
+static void snode_drawstring(SpaceNode *snode, char *str, int okwidth)
+{
+	char drawstr[NODE_MAXSTR];
+	int width;
+	
+	if(str[0]==0 || okwidth<4) return;
+	
+	BLI_strncpy(drawstr, str, NODE_MAXSTR);
+	width= snode->aspect*UI_GetStringWidth(snode->curfont, drawstr, 0);
+
+	if(width > okwidth) {
+		int len= strlen(drawstr)-1;
+		
+		while(width > okwidth && len>=0) {
+			drawstr[len]= 0;
+			
+			width= snode->aspect*UI_GetStringWidth(snode->curfont, drawstr, 0);
+			len--;
+		}
+		if(len==0) return;
+	}
+	UI_DrawString(snode->curfont, drawstr, 0);
+
+}
+
+/* ****************** GENERAL CALLBACKS FOR NODES ***************** */
+
+static void node_ID_title_cb(void *node_v, void *unused_v)
+{
+	bNode *node= node_v;
+	
+	if(node->id) {
+		test_idbutton(node->id->name+2);	/* library.c, verifies unique name */
+		BLI_strncpy(node->name, node->id->name+2, 21);
+		
+		// allqueue(REDRAWBUTSSHADING, 0);
+		// allqueue(REDRAWNODE, 0);
+		// allqueue(REDRAWOOPS, 0);
+	}
+}
+
+
+static void node_but_title_cb(void *node_v, void *but_v)
+{
+	bNode *node= node_v;
+	struct uiBut *bt= but_v;
+	BLI_strncpy(node->name, bt->drawstr, NODE_MAXSTR);
+	
+	// allqueue(REDRAWNODE, 0);
+}
+
+static void node_group_alone_cb(void *node_v, void *unused_v)
+{
+	bNode *node= node_v;
+	
+	nodeCopyGroup(node);
+
+	// allqueue(REDRAWNODE, 0);
+}
+
+/* ****************** BUTTON CALLBACKS FOR ALL TREES ***************** */
+
+static int node_buts_group(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+{
+	if(block && node->id) {
+		uiBut *bt;
+		short width;
+		
+		uiBlockBeginAlign(block);
+		
+		/* name button */
+		width= (short)(butr->xmax-butr->xmin - (node->id->us>1?19.0f:0.0f));
+		bt= uiDefBut(block, TEX, B_NOP, "NT:",
+					 butr->xmin, butr->ymin, width, 19, 
+					 node->id->name+2, 0.0, 19.0, 0, 0, "NodeTree name");
+		uiButSetFunc(bt, node_ID_title_cb, node, NULL);
+		
+		/* user amount */
+		if(node->id->us>1) {
+			char str1[32];
+			sprintf(str1, "%d", node->id->us);
+			bt= uiDefBut(block, BUT, B_NOP, str1, 
+						 butr->xmax-19, butr->ymin, 19, 19, 
+						 NULL, 0, 0, 0, 0, "Displays number of users.");
+			uiButSetFunc(bt, node_group_alone_cb, node, NULL);
+		}
+		
+		uiBlockEndAlign(block);
+	}	
+	return 19;
+}
+
+static int node_buts_value(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+{
+	if(block) {
+		bNodeSocket *sock= node->outputs.first;		/* first socket stores value */
+		
+		uiDefButF(block, NUM, B_NODE_EXEC+node->nr, "", 
+				  butr->xmin, butr->ymin, butr->xmax-butr->xmin, 20, 
+				  sock->ns.vec, sock->ns.min, sock->ns.max, 10, 2, "");
+		
+	}
+	return 20;
+}
+
+static int node_buts_rgb(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+{
+	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+node->nr, "", 
+					  butr->xmin, butr->ymin, butr->xmax-butr->xmin, 12, 
+					  sock->ns.vec, 0.0f, 1.0f, 3, 0, "");
+			uiDefButF(block, HSVCUBE, B_NODE_EXEC+node->nr, "", 
+					  butr->xmin, 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, "",		
+					  butr->xmin, 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);
+}
+
+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);
+		
+		/* blend type */
+		uiBlockBeginAlign(block);
+		bt=uiDefButS(block, MENU, B_NODE_EXEC+node->nr, "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",
+					 butr->xmin, 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+node->nr, "A",
+				  butr->xmax-20, butr->ymin, 20, 20, 
+				  &node->custom2, 0, 0, 0, 0, "Include Alpha of 2nd input in this operation");
+	}
+	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;
+
+		curvemap_buttons(block, node->storage, 's', B_NODE_EXEC+node->nr, 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);
+		}
+
+		uiBlockBeginAlign(block);
+		uiDefButS(block, NUM, B_NODE_EXEC+node->nr, "Sta:",
+				  butr->xmin, butr->ymin-22, dx, 19, 
+				  &node->custom1, 1.0, 20000.0, 0, 0, "Start frame");
+		uiDefButS(block, NUM, B_NODE_EXEC+node->nr, "End:",
+				  butr->xmin+dx, butr->ymin-22, dx, 19, 
+				  &node->custom2, 1.0, 20000.0, 0, 0, "End frame");
+	}
+	
+	return node->width-NODE_DY;
+}
+
+static int node_buts_valtorgb(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+{
+	if(block) {
+		if(node->storage) {
+			draw_colorband_buts_small(block, node->storage, butr, B_NODE_EXEC+node->nr);
+		}
+	}
+	return 40;
+}
+
+static int node_buts_curvevec(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+{
+	if(block) {
+		curvemap_buttons(block, node->storage, 'v', B_NODE_EXEC+node->nr, B_REDR, butr);
+	}	
+	return (int)(node->width-NODE_DY);
+}
+
+static float *_sample_col= NULL;	// bad bad, 2.5 will do better?
+void node_curvemap_sample(float *col)
+{
+	_sample_col= col;
+}
+
+static int node_buts_curvecol(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+{
+	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;
+
+		curvemap_buttons(block, node->storage, 'c', B_NODE_EXEC+node->nr, B_REDR, butr);
+	}	
+	return (int)(node->width-NODE_DY);
+}
+
+static int node_buts_normal(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+{
+	if(block) {
+		bNodeSocket *sock= node->outputs.first;		/* first socket stores normal */
+		
+		uiDefButF(block, BUT_NORMAL, B_NODE_EXEC+node->nr, "", 
+				  butr->xmin, 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);
+}
+
+static void node_browse_tex_cb(void *ntree_v, void *node_v)
+{
+	bNodeTree *ntree= ntree_v;
+	bNode *node= node_v;
+	Tex *tex;
+	
+	if(node->menunr<1) return;
+	
+	if(node->id) {
+		node->id->us--;
+		node->id= NULL;
+	}
+	tex= BLI_findlink(&G.main->tex, node->menunr-1);
+
+	node->id= &tex->id;
+	id_us_plus(node->id);
+	BLI_strncpy(node->name, node->id->name+2, 21);
+	
+	nodeSetActive(ntree, node);
+	
+	if( ntree->type == NTREE_TEXTURE )
+		ntreeTexCheckCyclics( ntree );
+	
+	// allqueue(REDRAWBUTSSHADING, 0);
+	// allqueue(REDRAWNODE, 0);
+	NodeTagChanged(ntree, node); 
+	
+	node->menunr= 0;
+}
+
+static void node_dynamic_update_cb(void *ntree_v, void *node_v)
+{
+	Material *ma;
+	bNode *node= (bNode *)node_v;
+	ID *id= node->id;
+	int error= 0;
+
+	if (BTST(node->custom1, NODE_DYNAMIC_ERROR)) error= 1;
+
+	/* Users only have to press the "update" button in one pynode
+	 * and we also update all others sharing the same script */
+	for (ma= G.main->mat.first; ma; ma= ma->id.next) {
+		if (ma->nodetree) {
+			bNode *nd;
+			for (nd= ma->nodetree->nodes.first; nd; nd= nd->next) {
+				if ((nd->type == NODE_DYNAMIC) && (nd->id == id)) {
+					nd->custom1= 0;
+					nd->custom1= BSET(nd->custom1, NODE_DYNAMIC_REPARSE);
+					nd->menunr= 0;
+					if (error)
+						nd->custom1= BSET(nd->custom1, NODE_DYNAMIC_ERROR);
+				}
+			}
+		}
+	}
+
+	// allqueue(REDRAWBUTSSHADING, 0);
+	// allqueue(REDRAWNODE, 0);
+	BIF_preview_changed(ID_MA);
+}
+
+static int node_buts_texture(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+{
+	short multi = (
+		node->id &&
+		((Tex*)node->id)->use_nodes &&
+		(node->type != CMP_NODE_TEXTURE) &&
+		(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+node->nr, 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;
+}
+
+static int node_buts_math(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr) 
+{ 
+	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; 
+}
+
+
+/* ****************** BUTTON CALLBACKS FOR SHADER NODES ***************** */
+
+static void node_browse_text_cb(void *ntree_v, void *node_v)
+{
+	bNodeTree *ntree= ntree_v;
+	bNode *node= node_v;
+	ID *oldid;
+	
+	if(node->menunr<1) return;
+	
+	if(node->id) {
+		node->id->us--;
+	}
+	oldid= node->id;
+	node->id= BLI_findlink(&G.main->text, node->menunr-1);
+	id_us_plus(node->id);
+	BLI_strncpy(node->name, node->id->name+2, 21); /* huh? why 21? */
+
+	node->custom1= BSET(node->custom1, NODE_DYNAMIC_NEW);
+	
+	nodeSetActive(ntree, node);
+
+	// allqueue(REDRAWBUTSSHADING, 0);
+	// allqueue(REDRAWNODE, 0);
+
+	node->menunr= 0;
+}
+
+static void node_mat_alone_cb(void *node_v, void *unused)
+{
+	bNode *node= node_v;
+	
+	node->id= (ID *)copy_material((Material *)node->id);
+	
+	//BIF_undo_push("Single user material");
+	// allqueue(REDRAWBUTSSHADING, 0);
+	// allqueue(REDRAWNODE, 0);
+	// allqueue(REDRAWOOPS, 0);
+}
+
+static void node_browse_mat_cb(void *ntree_v, void *node_v)
+{
+	bNodeTree *ntree= ntree_v;
+	bNode *node= node_v;
+	
+	if(node->menunr<1) return;
+	
+	if(node->menunr==32767) {	/* code for Add New */
+		if(node->id) {
+			/* make copy, but make sure it doesnt have the node tag nor nodes */
+			Material *ma= (Material *)node->id;
+			ma->id.us--;
+			ma= copy_material(ma);
+			ma->use_nodes= 0;
+			if(ma->nodetree) {
+				ntreeFreeTree(ma->nodetree);
+				MEM_freeN(ma->nodetree);
+			}
+			ma->nodetree= NULL;
+			node->id= (ID *)ma;
+		}
+		else node->id= (ID *)add_material("MatNode");
+	}
+	else {
+		if(node->id) node->id->us--;
+		node->id= BLI_findlink(&G.main->mat, node->menunr-1);
+		id_us_plus(node->id);
+	}
+	BLI_strncpy(node->name, node->id->name+2, 21);
+	
+	nodeSetActive(ntree, node);
+
+	// allqueue(REDRAWBUTSSHADING, 0);
+	// allqueue(REDRAWNODE, 0);
+	BIF_preview_changed(ID_MA);
+
+	node->menunr= 0;
+}
+
+static void node_new_mat_cb(void *ntree_v, void *node_v)
+{
+	bNodeTree *ntree= ntree_v;
+	bNode *node= node_v;
+	
+	node->id= (ID *)add_material("MatNode");
+	BLI_strncpy(node->name, node->id->name+2, 21);
+
+	nodeSetActive(ntree, node);
+
+	// allqueue(REDRAWBUTSSHADING, 0);
+	// allqueue(REDRAWNODE, 0);
+	BIF_preview_changed(ID_MA);
+
+}
+
+static void node_texmap_cb(void *texmap_v, void *unused_v)
+{
+	init_mapping(texmap_v);
+}
+
+static int node_shader_buts_material(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+{
+	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);
+		
+		/* 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);
+		}
+		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+node->nr, "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+node->nr, "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+node->nr, "Neg Normal",
+							 butr->xmax-dx, butr->ymin, dx, 19,
+							 &node->custom1, 0, 0, 0, 0, "Material Node uses inverted Normal");
+			}
+		}
+		uiBlockEndAlign(block);
+	}	
+	return 38;
+}
+
+static int node_shader_buts_mapping(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+{
+	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+node->nr, "", butr->xmin+dx, dy, 2*dx, 19, texmap->loc, -1000.0f, 1000.0f, 10, 2, "");
+		uiDefButF(block, NUM, B_NODE_EXEC+node->nr, "", butr->xmin+3*dx, dy, 2*dx, 19, texmap->loc+1, -1000.0f, 1000.0f, 10, 2, "");
+		uiDefButF(block, NUM, B_NODE_EXEC+node->nr, "", 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+node->nr, "", butr->xmin+dx, dy, 2*dx, 19, texmap->rot, -1000.0f, 1000.0f, 1000, 1, "");
+		uiDefButF(block, NUM, B_NODE_EXEC+node->nr, "", butr->xmin+3*dx, dy, 2*dx, 19, texmap->rot+1, -1000.0f, 1000.0f, 1000, 1, "");
+		uiDefButF(block, NUM, B_NODE_EXEC+node->nr, "", 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+node->nr, "", butr->xmin+dx, dy, 2*dx, 19, texmap->size, -1000.0f, 1000.0f, 10, 2, "");
+		uiDefButF(block, NUM, B_NODE_EXEC+node->nr, "", butr->xmin+3*dx, dy, 2*dx, 19, texmap->size+1, -1000.0f, 1000.0f, 10, 2, "");
+		uiDefButF(block, NUM, B_NODE_EXEC+node->nr, "", 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+node->nr, "", butr->xmin+dx, dy, 2*dx, 19, texmap->min, -10.0f, 10.0f, 100, 2, "");
+		uiDefButF(block, NUM, B_NODE_EXEC+node->nr, "", butr->xmin+3*dx, dy, 2*dx, 19, texmap->min+1, -10.0f, 10.0f, 100, 2, "");
+		uiDefButF(block, NUM, B_NODE_EXEC+node->nr, "", 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+node->nr, "", butr->xmin+dx, dy, 2*dx, 19, texmap->max, -10.0f, 10.0f, 10, 2, "");
+		uiDefButF(block, NUM, B_NODE_EXEC+node->nr, "", butr->xmin+3*dx, dy, 2*dx, 19, texmap->max+1, -10.0f, 10.0f, 10, 2, "");
+		uiDefButF(block, NUM, B_NODE_EXEC+node->nr, "", 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+node->nr, "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+node->nr, "Max", butr->xmin, dy, dx-4, 19, &texmap->flag, 0.0f, 0.0f, 0, 0, "");
+		
+	}	
+	return 5*19 + 6;
+}
+
+static int node_shader_buts_vect_math(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr) 
+{ 
+	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; 
+}
+
+static int node_shader_buts_geometry(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+{
+	if(block) {
+		uiBut *but;
+		NodeGeometry *ngeo= (NodeGeometry*)node->storage;
+
+		if(!verify_valid_uv_name(ngeo->uvname))
+			uiBlockSetCol(block, TH_REDALERT);
+		but= uiDefBut(block, TEX, B_NODE_EXEC+node->nr, "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);
+
+		if(!verify_valid_vcol_name(ngeo->colname))
+			uiBlockSetCol(block, TH_REDALERT);
+		but= uiDefBut(block, TEX, B_NODE_EXEC+node->nr, "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);
+	}
+
+	return 40;
+}
+
+static int node_shader_buts_dynamic(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr) 
+{ 
+	if (block) { 
+		uiBut *bt;
+		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);
+				ui_rasterpos_safe(butr->xmin + xoff, butr->ymin + 5, snode->aspect);
+				snode_drawstring(snode, "Error! Check console...", butr->xmax - butr->xmin);
+			}
+		}
+	}
+	return 20+19; 
+}
+
+/* only once called */
+static void node_shader_set_butfunc(bNodeType *ntype)
+{
+	switch(ntype->type) {
+		/* case NODE_GROUP:	 note, typeinfo for group is generated... see "XXX ugly hack" */
+
+		case SH_NODE_MATERIAL:
+		case SH_NODE_MATERIAL_EXT:
+			ntype->butfunc= node_shader_buts_material;
+			break;
+		case SH_NODE_TEXTURE:
+			ntype->butfunc= node_buts_texture;
+			break;
+		case SH_NODE_NORMAL:
+			ntype->butfunc= node_buts_normal;
+			break;
+		case SH_NODE_CURVE_VEC:
+			ntype->butfunc= node_buts_curvevec;
+			break;
+		case SH_NODE_CURVE_RGB:
+			ntype->butfunc= node_buts_curvecol;
+			break;
+		case SH_NODE_MAPPING:
+			ntype->butfunc= node_shader_buts_mapping;
+			break;
+		case SH_NODE_VALUE:
+			ntype->butfunc= node_buts_value;
+			break;
+		case SH_NODE_RGB:
+			ntype->butfunc= node_buts_rgb;
+			break;
+		case SH_NODE_MIX_RGB:
+			ntype->butfunc= node_buts_mix_rgb;
+			break;
+		case SH_NODE_VALTORGB:
+			ntype->butfunc= node_buts_valtorgb;
+			break;
+		case SH_NODE_MATH: 
+			ntype->butfunc= node_buts_math;
+			break; 
+		case SH_NODE_VECT_MATH: 
+			ntype->butfunc= node_shader_buts_vect_math;
+			break; 
+		case SH_NODE_GEOMETRY:
+			ntype->butfunc= node_shader_buts_geometry;
+			break;
+		case NODE_DYNAMIC:
+			ntype->butfunc= node_shader_buts_dynamic;
+			break;
+		default:
+			ntype->butfunc= NULL;
+	}
+}
+
+/* ****************** BUTTON CALLBACKS FOR COMPOSITE NODES ***************** */
+
+
+
+static void node_browse_image_cb(void *ntree_v, void *node_v)
+{
+	bNodeTree *ntree= ntree_v;
+	bNode *node= node_v;
+	
+	nodeSetActive(ntree, node);
+	
+	if(node->menunr<1) return;
+	if(node->menunr==32767) {	/* code for Load New */
+		/// addqueue(curarea->win, UI_BUT_EVENT, B_NODE_LOADIMAGE); XXX
+	}
+	else {
+		if(node->id) node->id->us--;
+		node->id= BLI_findlink(&G.main->image, node->menunr-1);
+		id_us_plus(node->id);
+
+		BLI_strncpy(node->name, node->id->name+2, 21);
+
+		NodeTagChanged(ntree, node); 
+		BKE_image_signal((Image *)node->id, node->storage, IMA_SIGNAL_USER_NEW_IMAGE);
+		// addqueue(curarea->win, UI_BUT_EVENT, B_NODE_EXEC+node->nr); XXX
+	}
+	node->menunr= 0;
+}
+
+static void node_active_cb(void *ntree_v, void *node_v)
+{
+	nodeSetActive(ntree_v, node_v);
+}
+static void node_image_type_cb(void *node_v, void *unused)
+{
+	
+	// allqueue(REDRAWNODE, 1);
+}
+
+static char *node_image_type_pup(void)
+{
+	char *str= MEM_mallocN(256, "image type pup");
+	int a;
+	
+	str[0]= 0;
+	
+	a= sprintf(str, "Image Type %%t|");
+	a+= sprintf(str+a, "  Image %%x%d %%i%d|", IMA_SRC_FILE, ICON_IMAGE_DEHLT);
+	a+= sprintf(str+a, "  Movie %%x%d %%i%d|", IMA_SRC_MOVIE, ICON_SEQUENCE);
+	a+= sprintf(str+a, "  Sequence %%x%d %%i%d|", IMA_SRC_SEQUENCE, ICON_IMAGE_COL);
+	a+= sprintf(str+a, "  Generated %%x%d %%i%d", IMA_SRC_GENERATED, ICON_BLANK1);
+	
+	return str;
+}
+
+/* copy from buttons_shading.c */
+static char *layer_menu(RenderResult *rr)
+{
+	RenderLayer *rl;
+	int len= 40 + 40*BLI_countlist(&rr->layers);
+	short a, nr;
+	char *str= MEM_callocN(len, "menu layers");
+	
+	strcpy(str, "Layer %t");
+	a= strlen(str);
+	for(nr=0, rl= rr->layers.first; rl; rl= rl->next, nr++) {
+		a+= sprintf(str+a, "|%s %%x%d", rl->name, nr);
+	}
+	
+	return str;
+}
+
+static void image_layer_cb(void *ima_v, void *iuser_v)
+{
+	
+	ntreeCompositForceHidden(G.scene->nodetree);
+	BKE_image_multilayer_index(ima_v, iuser_v);
+	// allqueue(REDRAWNODE, 0);
+}
+
+static int node_composit_buts_image(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+{
+	ImageUser *iuser= node->storage;
+	
+	if(block) {
+		uiBut *bt;
+		short dy= (short)butr->ymax-19;
+		char *strp;
+		
+		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, 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);
+			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_DEHLT;
+			
+			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);
+			
+			if( ELEM(ima->source, IMA_SRC_MOVIE, IMA_SRC_SEQUENCE) ) {
+				width= (xmax-xmin)/2;
+				
+				dy-= 19;
+				uiDefButI(block, NUM, B_NODE_EXEC+node->nr, "Frs:",
+						  xmin, dy, width, 19, 
+						  &iuser->frames, 1.0, MAXFRAMEF, 0, 0, "Amount of images used in animation");
+				uiDefButI(block, NUM, B_NODE_EXEC+node->nr, "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+node->nr, "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+node->nr, "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+node->nr, 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+node->nr, 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);
+				}
+			}
+		}
+		
+	}	
+	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+node->nr); 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 */
+static void set_render_layers_title(void *node_v, void *unused)
+{
+	bNode *node= node_v;
+	Scene *sce;
+	SceneRenderLayer *srl;
+	char str[64];
+	
+	if(node->id) {
+		BLI_strncpy(str, node->id->name+2, 21);
+		strcat(str, "|");
+		sce= (Scene *)node->id;
+	}
+	else {
+		str[0]= 0;
+		sce= G.scene;
+	}
+	srl= BLI_findlink(&sce->r.layers, node->custom1);
+	if(srl==NULL) {
+		node->custom1= 0;
+		srl= sce->r.layers.first;
+	}
+	
+	strcat(str, srl->name);
+	BLI_strncpy(node->name, str, 32);
+}
+
+static char *scene_layer_menu(Scene *sce)
+{
+	SceneRenderLayer *srl;
+	int len= 40 + 40*BLI_countlist(&sce->r.layers);
+	short a, nr;
+	char *str= MEM_callocN(len, "menu layers");
+	
+	strcpy(str, "Active Layer %t");
+	a= strlen(str);
+	for(nr=0, srl= sce->r.layers.first; srl; srl= srl->next, nr++) {
+		a+= sprintf(str+a, "|%s %%x%d", srl->name, nr);
+	}
+	
+	return str;
+}
+
+static void node_browse_scene_cb(void *ntree_v, void *node_v)
+{
+	bNodeTree *ntree= ntree_v;
+	bNode *node= node_v;
+	Scene *sce;
+	
+	if(node->menunr<1) return;
+	
+	if(node->id) {
+		node->id->us--;
+		node->id= NULL;
+	}
+	sce= BLI_findlink(&G.main->scene, node->menunr-1);
+	if(sce!=G.scene) {
+		node->id= &sce->id;
+		id_us_plus(node->id);
+	}
+	
+	set_render_layers_title(node, NULL);
+	nodeSetActive(ntree, node);
+
+	// allqueue(REDRAWBUTSSHADING, 0);
+	// allqueue(REDRAWNODE, 0);
+	NodeTagChanged(ntree, node); 
+
+	node->menunr= 0;
+}
+
+
+static int node_composit_buts_renderlayers(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+{
+	if(block) {
+		uiBut *bt;
+		char *strp;
+		
+		/* browse button scene */
+		uiBlockBeginAlign(block);
+		IDnames_to_pupstring(&strp, NULL, "", &(G.main->scene), NULL, NULL);
+		node->menunr= 0;
+		bt= uiDefButS(block, MENU, B_NOP, strp, 
+					  butr->xmin, butr->ymin, 20, 19, 
+					  &node->menunr, 0, 0, 0, 0, "Browse Scene to use RenderLayer from");
+		uiButSetFunc(bt, node_browse_scene_cb, ntree, node);
+		if(strp) MEM_freeN(strp);
+		
+		/* browse button layer */
+		strp= scene_layer_menu(node->id?(Scene *)node->id:G.scene);
+		if(node->id)
+			bt= uiDefIconTextButS(block, MENU, B_NODE_EXEC+node->nr, ICON_SCENE_DEHLT, strp, 
+				  butr->xmin+20, butr->ymin, (butr->xmax-butr->xmin)-40, 19, 
+				  &node->custom1, 0, 0, 0, 0, "Choose Render Layer");
+		else
+			bt= uiDefButS(block, MENU, B_NODE_EXEC+node->nr, strp, 
+				  butr->xmin+20, butr->ymin, (butr->xmax-butr->xmin)-40, 19, 
+				  &node->custom1, 0, 0, 0, 0, "Choose Render Layer");
+		uiButSetFunc(bt, set_render_layers_title, node, NULL);
+		MEM_freeN(strp);
+		
+		/* re-render */
+		/* uses custom2, not the best implementation of the world... but we need it to work now :) */
+		bt= uiDefIconButS(block, TOG, B_NODE_EXEC+node->nr, ICON_SCENE, 
+				  butr->xmax-20, butr->ymin, 20, 19, 
+				  &node->custom2, 0, 0, 0, 0, "Re-render this Layer");
+		
+	}
+	return 19;
+}
+
+static void node_blur_relative_cb(void *node, void *poin2)
+{
+	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);
+		}
+	}
+	// allqueue(REDRAWNODE, 0);
+}
+static void node_blur_update_sizex_cb(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(void *node, void *poin2)
+{
+	bNode *nodev= node;
+	NodeBlurData *nbd= nodev->storage;
+
+	nbd->sizey= (int)(nbd->percenty*nbd->image_in_height);
+}
+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+node->nr,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+node->nr, "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+node->nr, "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+node->nr, "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+node->nr, "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+node->nr, "X:",
+						 butr->xmin, dy, dx, 19, 
+						 &nbd->sizex, 0, 256, 0, 0, "");
+			uiDefButS(block, NUM, B_NODE_EXEC+node->nr, "Y:",
+						 butr->xmin+dx, dy, dx, 19, 
+						 &nbd->sizey, 0, 256, 0, 0, "");
+		}
+		uiBlockEndAlign(block);
+	}
+	return 77;
+}
+
+static int node_composit_buts_dblur(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+{
+	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+node->nr, "Iterations:",
+				butr->xmin, dy, dx, 19,
+				&ndbd->iter, 1, 32, 10, 0, "Amount of iterations");
+		uiDefButC(block, TOG, B_NODE_EXEC+node->nr, "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+node->nr, "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+node->nr, "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+node->nr, "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+node->nr, "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);
+
+		dy-= 9;
+
+		uiDefButF(block, NUM, B_NODE_EXEC+node->nr, "Spin:",
+				butr->xmin, dy-= 19, dx, 19,
+				&ndbd->spin, -360.0f, 360.0f, 1000, 0, "Angle that is used to spin the image");
+
+		dy-= 9;
+
+		uiDefButF(block, NUM, B_NODE_EXEC+node->nr, "Zoom:",
+				butr->xmin, dy-= 19, dx, 19,
+				&ndbd->zoom, 0.0f, 100.0f, 100, 0, "Amount of which the image is zoomed");
+
+	}
+	return 190;
+}
+
+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+node->nr, "Iterations:",
+				 butr->xmin, dy, dx, 19, 
+				 &nbbd->iter, 1, 128, 0, 0, "Amount of iterations");
+		dy-=19;
+		uiDefButF(block, NUM, B_NODE_EXEC+node->nr, "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+node->nr, "Space Sigma:",
+				  butr->xmin, dy, dx, 19, 
+				  &nbbd->sigma_space ,0.01, 30, 10, 0, "Sigma value used to modify space");
+		
+	}
+	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+node->nr, 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+node->nr, "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+node->nr, "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+node->nr, "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+node->nr, "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+node->nr, "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+node->nr, "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+node->nr, "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+node->nr, "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+node->nr, "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");
+		}
+	}
+	return 228;
+}
+
+
+/* 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+node->nr, mn1,
+		          butr->xmin, dy, dx, 19,
+		          &ndg->type, 0, 0, 0, 0, "Glow/Flare/Bloom type");
+		uiDefButC(block, MENU, B_NODE_EXEC+node->nr, 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+node->nr, "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+node->nr, "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+node->nr, "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+node->nr, "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+node->nr, "streaks:",
+				          butr->xmin, dy-114, dx, 19,
+				          &ndg->angle, 2, 16, 1000, 0,
+				          "Total number of streaks");
+				uiDefButC(block, NUM, B_NODE_EXEC+node->nr, "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+node->nr, "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+node->nr, "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+node->nr, "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)");
+	}
+	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+node->nr, 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+node->nr, "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+node->nr, "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+node->nr, "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+node->nr, "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+node->nr, "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+node->nr, "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+node->nr, "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);
+	}
+	return 95;
+}
+
+/* qdn: lens distortion node */
+static int node_composit_buts_lensdist(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+{
+	if(block) {
+		NodeLensDist *nld = node->storage;
+		short dy = butr->ymin + 19, dx = butr->xmax - butr->xmin; 
+		uiBlockBeginAlign(block);
+		uiDefButS(block, TOG, B_NODE_EXEC+node->nr, "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+node->nr, "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+node->nr, "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;
+}
+
+
+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+node->nr, "Samples:",
+				 butr->xmin, dy+76, dx, 19, 
+				 &nbd->samples, 1, 256, 0, 0, "Amount of samples");
+		uiDefButS(block, NUM, B_NODE_EXEC+node->nr, "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+node->nr, "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+node->nr, "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+node->nr, "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;
+}
+
+static int node_composit_buts_filter(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+{
+	if(block) {
+		uiBut *bt;
+		
+		/* blend type */
+		bt=uiDefButS(block, MENU, B_NODE_EXEC+node->nr, "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;
+}
+
+static int node_composit_buts_flip(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr) 
+{
+	if(block) {
+		uiBut *bt;
+		
+		/* flip x\y */
+		bt=uiDefButS(block, MENU, B_NODE_EXEC+node->nr, "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;	
+}
+
+static int node_composit_buts_crop(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+{
+	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+node->nr, "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+node->nr, "X1:",
+					 butr->xmin, dy, dx, elementheight,
+					 &ntxy->x1, xymin, xymax, 0, 0, "");
+		/* y1 */
+		uiDefButS(block, NUM, B_NODE_EXEC+node->nr, "Y1:",
+					 butr->xmin+dx, dy, dx, elementheight,
+					 &ntxy->y1, xymin, xymax, 0, 0, "");
+
+		dy-=elementheight;
+
+		/* x2 */
+		uiDefButS(block, NUM, B_NODE_EXEC+node->nr, "X2:",
+					 butr->xmin, dy, dx, elementheight,
+					 &ntxy->x2, xymin, xymax, 0, 0, "");
+		/* y2 */
+		uiDefButS(block, NUM, B_NODE_EXEC+node->nr, "Y2:",
+					 butr->xmin+dx, dy, dx, elementheight,
+					 &ntxy->y2, xymin, xymax, 0, 0, "");
+
+		uiBlockEndAlign(block);
+	}
+	return 60;
+}
+
+static int node_composit_buts_splitviewer(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+{
+	if(block) {	
+		uiBlockBeginAlign(block);
+		
+		uiDefButS(block, ROW, B_NODE_EXEC+node->nr, "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+node->nr, "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+node->nr, "Split %: ",
+				butr->xmin, butr->ymin, butr->xmax-butr->xmin, 20, &node->custom1, 0, 100, 10, 0, "");
+	}
+	return 40;
+}
+
+static int node_composit_buts_map_value(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+{
+	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+node->nr, "Offs:", xstart, dy, 2*dx, 19, texmap->loc, -1000.0f, 1000.0f, 10, 2, "");
+		dy-= 19;
+		uiDefButF(block, NUM, B_NODE_EXEC+node->nr, "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+node->nr, "Min", xstart, dy, dx, 19, &texmap->flag, 0.0f, 0.0f, 0, 0, "");
+		uiDefButF(block, NUM, B_NODE_EXEC+node->nr, "", xstart+dx, dy, dx, 19, texmap->min, -1000.0f, 1000.0f, 10, 2, "");
+		dy-= 19;
+		uiDefButBitI(block, TOG, TEXMAP_CLIP_MAX, B_NODE_EXEC+node->nr, "Max", xstart, dy, dx, 19, &texmap->flag, 0.0f, 0.0f, 0, 0, "");
+		uiDefButF(block, NUM, B_NODE_EXEC+node->nr, "", xstart+dx, dy, dx, 19, texmap->max, -1000.0f, 1000.0f, 10, 2, "");
+	}
+	return 80;
+}
+
+static int node_composit_buts_alphaover(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+{
+	if(block) {
+		NodeTwoFloats *ntf= node->storage;
+		
+		/* alpha type */
+		uiDefButS(block, TOG, B_NODE_EXEC+node->nr, "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+node->nr, "Premul: ",
+				  butr->xmin, butr->ymin, butr->xmax-butr->xmin, 19, 
+				  &ntf->x, 0.0f, 1.0f, 100, 0, "");
+	}
+	return 38;
+}
+
+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+node->nr, "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+node->nr, "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+node->nr, "Val: ",
+				  butr->xmin, butr->ymin, butr->xmax-butr->xmin, 20, 
+				  &nhs->val, 0.0f, 2.0f, 100, 0, "");
+	}
+	return 60;
+}
+
+static int node_composit_buts_dilateerode(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+{
+	if(block) {
+		uiDefButS(block, NUM, B_NODE_EXEC+node->nr, "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;
+}
+
+static int node_composit_buts_diff_matte(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+{
+	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+node->nr,"RGB",
+							butr->xmin,butr->ymin+60,sx,20,
+							&node->custom1,1,1, 0, 0, "RGB Color Space");
+		uiDefButS(block, ROW,B_NODE_EXEC+node->nr,"HSV",
+							butr->xmin+sx,butr->ymin+60,sx,20,
+							&node->custom1,1,2, 0, 0, "HSV Color Space");
+		uiDefButS(block, ROW,B_NODE_EXEC+node->nr,"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+node->nr,"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+node->nr, " ",
+							butr->xmin, butr->ymin+40, dx, 20,
+							&c->t1, 0.0f, 1.0f, 100, 0, "Channel 1 Tolerance");
+		uiDefButF(block, NUM, B_NODE_EXEC+node->nr, " ",
+							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+node->nr, " ",
+							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+node->nr, "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+node->nr, "Falloff: ",
+			butr->xmin, butr->ymin+20, butr->xmax-butr->xmin, 20,
+			&c->fstrength, 0.0f, 1.0f, 100, 0, "");
+	}
+	return 80;
+}
+
+static int node_composit_buts_color_spill(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+{
+	if(block) {
+		short dx= (butr->xmax-butr->xmin)/3;
+
+		NodeChroma *c=node->storage;
+		uiBlockBeginAlign(block);
+		uiDefButF(block, NUM, B_NODE_EXEC+node->nr, "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+node->nr, "R",
+				butr->xmin,butr->ymin,dx,20,
+				&node->custom1,1,1, 0, 0, "Red Spill Suppression");
+		uiDefButS(block, ROW, B_NODE_EXEC+node->nr, "G",
+				butr->xmin+dx,butr->ymin,dx,20,
+				&node->custom1,1,2, 0, 0, "Green Spill Suppression");
+		uiDefButS(block, ROW, B_NODE_EXEC+node->nr, "B",
+				butr->xmin+2*dx,butr->ymin,dx,20,
+				&node->custom1, 1, 3, 0, 0, "Blue Spill Suppression");
+		uiBlockEndAlign(block);
+	}
+	return 60;
+}
+
+static int node_composit_buts_chroma_matte(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+{
+	if(block) {
+		short dx=(butr->xmax-butr->xmin)/2;
+		NodeChroma *c= node->storage;
+		uiBlockBeginAlign(block);
+
+		uiDefButF(block, NUMSLI, B_NODE_EXEC+node->nr, "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+node->nr, "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+node->nr, "Lift ",
+			butr->xmin, butr->ymin+20, dx, 20,
+			&c->fsize, 0.0f, 1.0f, 100, 0, "Alpha Lift");
+		uiDefButF(block, NUMSLI, B_NODE_EXEC+node->nr, "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+node->nr, "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;
+}
+
+static int node_composit_buts_channel_matte(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+{
+	if(block) {
+		short sx= (butr->xmax-butr->xmin)/4;
+		short cx= (butr->xmax-butr->xmin)/3;
+		NodeChroma *c=node->storage;
+		char *c1, *c2, *c3;
+	
+		/*color space selectors*/
+		uiBlockBeginAlign(block);
+		uiDefButS(block, ROW,B_NODE_EXEC+node->nr,"RGB",
+			butr->xmin,butr->ymin+60,sx,20,&node->custom1,1,1, 0, 0, "RGB Color Space");
+		uiDefButS(block, ROW,B_NODE_EXEC+node->nr,"HSV",
+			butr->xmin+sx,butr->ymin+60,sx,20,&node->custom1,1,2, 0, 0, "HSV Color Space");
+		uiDefButS(block, ROW,B_NODE_EXEC+node->nr,"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+node->nr,"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";
+		}
+	
+		/*channel selector */
+		uiDefButS(block, ROW, B_NODE_EXEC+node->nr, c1,
+			butr->xmin,butr->ymin+40,cx,20,&node->custom2,1, 1, 0, 0, "Channel 1");
+		uiDefButS(block, ROW, B_NODE_EXEC+node->nr, c2,
+			butr->xmin+cx,butr->ymin+40,cx,20,&node->custom2,1, 2, 0, 0, "Channel 2");
+		uiDefButS(block, ROW, B_NODE_EXEC+node->nr, 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+node->nr, "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+node->nr, "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);
+	
+		/*keep t2 (low) less than t1 (high) */
+		if(c->t2 > c->t1) {
+			c->t2=c->t1;
+		}
+	}
+	return 80;
+}
+
+static int node_composit_buts_luma_matte(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+{
+	if(block) {
+		NodeChroma *c=node->storage;
+	
+		/*tolerance sliders */
+		uiDefButF(block, NUMSLI, B_NODE_EXEC+node->nr, "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+node->nr, "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);
+	
+		/*keep t2 (low) less than t1 (high) */
+		if(c->t2 > c->t1) {
+			c->t2=c->t1;
+		}
+	}
+	return 40;
+}
+
+static int node_composit_buts_map_uv(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+{
+	if(block) {
+		uiDefButS(block, NUM, B_NODE_EXEC+node->nr, "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;
+}
+
+static int node_composit_buts_id_mask(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+{
+	if(block) {
+		uiDefButS(block, NUM, B_NODE_EXEC+node->nr, "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;
+}
+
+/* allocate sufficient! */
+static void node_imagetype_string(char *str)
+{
+	str += sprintf(str, "Save Image as: %%t|");
+	str += sprintf(str, "Targa %%x%d|", R_TARGA);
+	str += sprintf(str, "Targa Raw %%x%d|", R_RAWTGA);
+	str += sprintf(str, "PNG %%x%d|", R_PNG);
+	str += sprintf(str, "BMP %%x%d|", R_BMP);
+	str += sprintf(str, "Jpeg %%x%d|", R_JPEG90);
+	str += sprintf(str, "Iris %%x%d|", R_IRIS);
+	str += sprintf(str, "Radiance HDR %%x%d|", R_RADHDR);
+	str += sprintf(str, "Cineon %%x%d|", R_CINEON);
+	str += sprintf(str, "DPX %%x%d|", R_DPX);
+	str += sprintf(str, "OpenEXR %%x%d", R_OPENEXR);
+}
+
+static void node_set_image_cb(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)
+{
+	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+node->nr, "SFra: ", 
+				  x, y, w/2, 20, 
+				  &nif->sfra, 1, MAXFRAMEF, 10, 0, "");
+		uiDefButI(block, NUM, B_NODE_EXEC+node->nr, "EFra: ", 
+				  x+w/2, y, w/2, 20, 
+				  &nif->efra, 1, MAXFRAMEF, 10, 0, "");
+		
+	}
+	return 80;
+}
+
+static void node_scale_cb(void *node_v, void *unused_v)
+{
+	bNode *node= node_v;
+	bNodeSocket *nsock;
+
+	/* check the 2 inputs, and set them to reasonable values */
+	for(nsock= node->inputs.first; nsock; nsock= nsock->next) {
+		if(ELEM(node->custom1, CMP_SCALE_RELATIVE, CMP_SCALE_SCENEPERCENT))
+			nsock->ns.vec[0]= 1.0;
+		else {
+			if(nsock->next==NULL)
+				nsock->ns.vec[0]= (float)G.scene->r.ysch;
+			else
+				nsock->ns.vec[0]= (float)G.scene->r.xsch;
+		}
+	}	
+}
+
+static int node_composit_buts_scale(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+{
+	if(block) {
+		uiBut *bt= uiDefButS(block, MENU, B_NODE_EXEC+node->nr, "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;
+}
+
+static int node_composit_buts_invert(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr) 
+{
+	if(block) {
+		uiBlockBeginAlign(block);
+		uiDefButBitS(block, TOG, CMP_CHAN_RGB, B_NODE_EXEC+node->nr, "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+node->nr, "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;	
+}
+
+static int node_composit_buts_premulkey(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+{
+	if(block) {
+		uiBut *bt;
+		
+		/* blend type */
+		bt=uiDefButS(block, MENU, B_NODE_EXEC+node->nr, "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;
+}
+
+/* only once called */
+static void node_composit_set_butfunc(bNodeType *ntype)
+{
+	switch(ntype->type) {
+		/* case NODE_GROUP:	 note, typeinfo for group is generated... see "XXX ugly hack" */
+
+		case CMP_NODE_IMAGE:
+			ntype->butfunc= node_composit_buts_image;
+			break;
+		case CMP_NODE_R_LAYERS:
+			ntype->butfunc= node_composit_buts_renderlayers;
+			break;
+		case CMP_NODE_NORMAL:
+			ntype->butfunc= node_buts_normal;
+			break;
+		case CMP_NODE_CURVE_VEC:
+			ntype->butfunc= node_buts_curvevec;
+			break;
+		case CMP_NODE_CURVE_RGB:
+			ntype->butfunc= node_buts_curvecol;
+			break;
+		case CMP_NODE_VALUE:
+			ntype->butfunc= node_buts_value;
+			break;
+		case CMP_NODE_RGB:
+			ntype->butfunc= node_buts_rgb;
+			break;
+		case CMP_NODE_FLIP:
+			ntype->butfunc= node_composit_buts_flip;
+			break;
+		case CMP_NODE_SPLITVIEWER:
+			ntype->butfunc= node_composit_buts_splitviewer;
+			break;
+		case CMP_NODE_MIX_RGB:
+			ntype->butfunc= node_buts_mix_rgb;
+			break;
+		case CMP_NODE_VALTORGB:
+			ntype->butfunc= node_buts_valtorgb;
+			break;
+		case CMP_NODE_CROP:
+			ntype->butfunc= node_composit_buts_crop;
+			break;
+		case CMP_NODE_BLUR:
+			ntype->butfunc= node_composit_buts_blur;
+			break;
+		case CMP_NODE_DBLUR:
+			ntype->butfunc= node_composit_buts_dblur;
+			break;
+		case CMP_NODE_BILATERALBLUR:
+			ntype->butfunc= node_composit_buts_bilateralblur;
+			break;
+		/* qdn: defocus node */
+		case CMP_NODE_DEFOCUS:
+			ntype->butfunc = node_composit_buts_defocus;
+			break;
+		/* qdn: glare node */
+		case CMP_NODE_GLARE:
+			ntype->butfunc = node_composit_buts_glare;
+			break;
+		/* qdn: tonemap node */
+		case CMP_NODE_TONEMAP:
+			ntype->butfunc = node_composit_buts_tonemap;
+			break;
+		/* qdn: lens distortion node */
+		case CMP_NODE_LENSDIST:
+			ntype->butfunc = node_composit_buts_lensdist;
+			break;
+		case CMP_NODE_VECBLUR:
+			ntype->butfunc= node_composit_buts_vecblur;
+			break;
+		case CMP_NODE_FILTER:
+			ntype->butfunc= node_composit_buts_filter;
+			break;
+		case CMP_NODE_MAP_VALUE:
+			ntype->butfunc= node_composit_buts_map_value;
+			break;
+		case CMP_NODE_TIME:
+			ntype->butfunc= node_buts_time;
+			break;
+		case CMP_NODE_ALPHAOVER:
+			ntype->butfunc= node_composit_buts_alphaover;
+			break;
+		case CMP_NODE_HUE_SAT:
+			ntype->butfunc= node_composit_buts_hue_sat;
+			break;
+		case CMP_NODE_TEXTURE:
+			ntype->butfunc= node_buts_texture;
+			break;
+		case CMP_NODE_DILATEERODE:
+			ntype->butfunc= node_composit_buts_dilateerode;
+			break;
+		case CMP_NODE_OUTPUT_FILE:
+			ntype->butfunc= node_composit_buts_file_output;
+			break;
+	
+		case CMP_NODE_DIFF_MATTE:
+			ntype->butfunc=node_composit_buts_diff_matte;
+			break;
+		case CMP_NODE_COLOR_SPILL:
+			ntype->butfunc=node_composit_buts_color_spill;
+			break;
+		case CMP_NODE_CHROMA:
+			ntype->butfunc=node_composit_buts_chroma_matte;
+			break;
+		case CMP_NODE_SCALE:
+			ntype->butfunc= node_composit_buts_scale;
+			break;
+		case CMP_NODE_CHANNEL_MATTE:
+			ntype->butfunc= node_composit_buts_channel_matte;
+			break;
+		case CMP_NODE_LUMA_MATTE:
+			ntype->butfunc= node_composit_buts_luma_matte;
+			break;
+		case CMP_NODE_MAP_UV:
+			ntype->butfunc= node_composit_buts_map_uv;
+			break;
+		case CMP_NODE_ID_MASK:
+			ntype->butfunc= node_composit_buts_id_mask;
+			break;
+		case CMP_NODE_MATH:
+			ntype->butfunc= node_buts_math;
+			break;
+		case CMP_NODE_INVERT:
+			ntype->butfunc= node_composit_buts_invert;
+			break;
+		case CMP_NODE_PREMULKEY:
+			ntype->butfunc= node_composit_buts_premulkey;
+			break;
+		default:
+			ntype->butfunc= NULL;
+	}
+}
+
+/* ****************** BUTTON CALLBACKS FOR TEXTURE NODES ***************** */
+
+static int node_texture_buts_bricks(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+{
+	if(block) {
+		short w = butr->xmax-butr->xmin;
+		short ofw = 32;
+		
+		uiBlockBeginAlign(block);
+		
+		/* Offset */
+		uiDefButF(
+			block, NUM, B_NODE_EXEC+node->nr, "Offset",
+			butr->xmin, butr->ymin+20, w-ofw, 20,
+			&node->custom3,
+			0, 1, 0.25, 2,
+			"Offset amount" );
+		uiDefButS(
+			block, NUM, B_NODE_EXEC+node->nr, "",
+			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+node->nr, "Squash",
+			butr->xmin, butr->ymin+0, w-ofw, 20,
+			&node->custom4,
+			0, 99, 0.25, 2,
+			"Stretch amount" );
+		uiDefButS(
+			block, NUM, B_NODE_EXEC+node->nr, "",
+			butr->xmin+w-ofw, butr->ymin+0, ofw, 20,
+			&node->custom2,
+			2, 99, 0, 0,
+			"Stretch every N rows" );
+		
+		uiBlockEndAlign(block);
+	}
+	return 40;
+}
+
+/* Copied from buttons_shading.c -- needs unifying */
+static char* noisebasis_menu()
+{
+	static char nbmenu[256];
+	sprintf(nbmenu, "Noise Basis %%t|Blender Original %%x%d|Original Perlin %%x%d|Improved Perlin %%x%d|Voronoi F1 %%x%d|Voronoi F2 %%x%d|Voronoi F3 %%x%d|Voronoi F4 %%x%d|Voronoi F2-F1 %%x%d|Voronoi Crackle %%x%d|CellNoise %%x%d", TEX_BLENDER, TEX_STDPERLIN, TEX_NEWPERLIN, TEX_VORONOI_F1, TEX_VORONOI_F2, TEX_VORONOI_F3, TEX_VORONOI_F4, TEX_VORONOI_F2F1, TEX_VORONOI_CRACKLE, TEX_CELLNOISE);
+	return nbmenu;
+}
+
+static int node_texture_buts_proc(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *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;
+	}
+	
+	switch( tex->type ) {
+		case TEX_BLEND:
+			if( block ) {
+				uiBlockBeginAlign( block );
+				uiDefButS( block, MENU, B_NODE_EXEC+node->nr,
+					"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+node->nr, "Flip XY", x, y, w, 20,
+					&tex->flag, 0, 0, 0, 0, "Flips the direction of the progression 90 degrees");
+				uiBlockEndAlign( block );
+			}
+			return 40;
+			
+			
+		case TEX_MARBLE:
+			if( block ) {
+				uiBlockBeginAlign(block);
+			
+				uiDefButS(block, ROW, B_NODE_EXEC+node->nr, "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+node->nr, "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+node->nr, "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+node->nr, "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+node->nr, "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+node->nr, "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+node->nr, "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+node->nr, "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;
+			
+		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+node->nr, "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+node->nr, "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+node->nr, "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+node->nr, "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+node->nr, "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; 
+			
+		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;
+			
+		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;
+	}
+	return 0;
+}
+
+static int node_texture_buts_image(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+{
+	char *strp;
+	uiBut *bt;
+	
+	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);
+		
+		/* 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);
+		}
+	}
+	return 20;
+}
+
+static int node_texture_buts_output(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
+{
+	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;
+}
+
+/* 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;
+	}
+	else switch(ntype->type) {
+		
+		case TEX_NODE_MATH:
+			ntype->butfunc = node_buts_math;
+			break;
+		
+		case TEX_NODE_MIX_RGB:
+			ntype->butfunc = node_buts_mix_rgb;
+			break;
+			
+		case TEX_NODE_VALTORGB:
+			ntype->butfunc = node_buts_valtorgb;
+			break;
+			
+		case TEX_NODE_CURVE_RGB:
+			ntype->butfunc= node_buts_curvecol;
+			break;
+			
+		case TEX_NODE_CURVE_TIME:
+			ntype->butfunc = node_buts_time;
+			break;
+			
+		case TEX_NODE_TEXTURE:
+			ntype->butfunc = node_buts_texture;
+			break;
+			
+		case TEX_NODE_BRICKS:
+			ntype->butfunc = node_texture_buts_bricks;
+			break;
+			
+		case TEX_NODE_IMAGE:
+			ntype->butfunc = node_texture_buts_image;
+			break;
+			
+		case TEX_NODE_OUTPUT:
+			ntype->butfunc = node_texture_buts_output;
+			break;
+			
+		default:
+			ntype->butfunc= NULL;
+	}
+}
+
+/* ******* init draw callbacks for all tree types, only called in usiblender.c, once ************* */
+
+void init_node_butfuncs(void)
+{
+	bNodeType *ntype;
+	
+	/* shader nodes */
+	ntype= node_all_shaders.first;
+	while(ntype) {
+		node_shader_set_butfunc(ntype);
+		ntype= ntype->next;
+	}
+	/* composit nodes */
+	ntype= node_all_composit.first;
+	while(ntype) {
+		node_composit_set_butfunc(ntype);
+		ntype= ntype->next;
+	}
+	ntype = node_all_textures.first;
+	while(ntype) {
+		node_texture_set_butfunc(ntype);
+		ntype= ntype->next;
+	}
+}
+
+/* ************** Generic drawing ************** */
+
+void node_rename_but(char *s)
+{
+	uiBlock *block;
+	ListBase listb={0, 0};
+	int dy, x1, y1, sizex=80, sizey=30;
+	short pivot[2], mval[2], ret=0;
+	
+	getmouseco_sc(mval);
+
+	pivot[0]= CLAMPIS(mval[0], (sizex+10), G.curscreen->sizex-30);
+	pivot[1]= CLAMPIS(mval[1], (sizey/2)+10, G.curscreen->sizey-(sizey/2)-10);
+	
+	if (pivot[0]!=mval[0] || pivot[1]!=mval[1])
+		warp_pointer(pivot[0], pivot[1]);
+
+	mywinset(G.curscreen->mainwin);
+	
+	x1= pivot[0]-sizex+10;
+	y1= pivot[1]-sizey/2;
+	dy= sizey/2;
+	
+	block= uiNewBlock(&listb, "button", UI_EMBOSS, UI_HELV, G.curscreen->mainwin);
+	uiBlockSetFlag(block, UI_BLOCK_LOOP|UI_BLOCK_REDRAW|UI_BLOCK_NUMSELECT|UI_BLOCK_ENTER_OK);
+	
+	/* buttons have 0 as return event, to prevent menu to close on hotkeys */
+	uiBlockBeginAlign(block);
+	
+	uiDefBut(block, TEX, B_NOP, "Name: ", (short)(x1),(short)(y1+dy), 150, 19, s, 0.0, 19.0, 0, 0, "Node user name");
+	
+	uiBlockEndAlign(block);
+
+	uiDefBut(block, BUT, 32767, "OK", (short)(x1+150), (short)(y1+dy), 29, 19, NULL, 0, 0, 0, 0, "");
+
+	uiBoundsBlock(block, 2);
+
+	ret= uiDoBlocks(&listb, 0, 0);
+}
+
+
+static void draw_nodespace_grid(SpaceNode *snode)
+{
+	float start, step= 25.0f;
+
+	UI_ThemeColorShade(TH_BACK, -10);
+	
+	start= snode->v2d.cur.xmin -fmod(snode->v2d.cur.xmin, step);
+	
+	glBegin(GL_LINES);
+	for(; start<snode->v2d.cur.xmax; start+=step) {
+		glVertex2f(start, snode->v2d.cur.ymin);
+		glVertex2f(start, snode->v2d.cur.ymax);
+	}
+
+	start= snode->v2d.cur.ymin -fmod(snode->v2d.cur.ymin, step);
+	for(; start<snode->v2d.cur.ymax; start+=step) {
+		glVertex2f(snode->v2d.cur.xmin, start);
+		glVertex2f(snode->v2d.cur.xmax, start);
+	}
+	
+	/* X and Y axis */
+	UI_ThemeColorShade(TH_BACK, -18);
+	glVertex2f(0.0f, snode->v2d.cur.ymin);
+	glVertex2f(0.0f, snode->v2d.cur.ymax);
+	glVertex2f(snode->v2d.cur.xmin, 0.0f);
+	glVertex2f(snode->v2d.cur.xmax, 0.0f);
+	
+	glEnd();
+}
+
+static void draw_nodespace_back_pix(ScrArea *sa, SpaceNode *snode)
+{
+	
+	draw_nodespace_grid(snode);
+	
+	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);
+		if(ibuf) {
+			int x, y; 
+			/* somehow the offset has to be calculated inverse */
+			
+			glaDefine2DArea(&sa->winrct);
+			/* ortho at pixel level curarea */
+			myortho2(-0.375, sa->winx-0.375, -0.375, sa->winy-0.375);
+			
+			x = (sa->winx-ibuf->x)/2 + snode->xof;
+			y = (sa->winy-ibuf->y)/2 + snode->yof;
+			
+			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 */
+			myortho2(snode->v2d.cur.xmin, snode->v2d.cur.xmax, snode->v2d.cur.ymin, snode->v2d.cur.ymax);
+			bwin_clear_viewmat(sa->win);	/* clear buttons view */
+			glLoadIdentity();
+		}
+	}
+}
+
+#if 0
+/* note: needs to be userpref or opengl profile option */
+static void draw_nodespace_back_tex(ScrArea *sa, SpaceNode *snode)
+{
+
+	draw_nodespace_grid(snode);
+	
+	if(snode->flag & SNODE_BACKDRAW) {
+		Image *ima= BKE_image_verify_viewer(IMA_TYPE_COMPOSITE, "Viewer Node");
+		ImBuf *ibuf= BKE_image_get_ibuf(ima, NULL);
+		if(ibuf) {
+			int x, y;
+			float zoom = 1.0;
+
+			glMatrixMode(GL_PROJECTION);
+			glPushMatrix();
+			glMatrixMode(GL_MODELVIEW);
+			glPushMatrix();
+			
+			glaDefine2DArea(&sa->winrct);
+
+			if(ibuf->x > sa->winx || ibuf->y > sa->winy) {
+				float zoomx, zoomy;
+				zoomx= (float)sa->winx/ibuf->x;
+				zoomy= (float)sa->winy/ibuf->y;
+				zoom = MIN2(zoomx, zoomy);
+			}
+			
+			x = (sa->winx-zoom*ibuf->x)/2 + snode->xof;
+			y = (sa->winy-zoom*ibuf->y)/2 + snode->yof;
+
+			glPixelZoom(zoom, zoom);
+
+			glColor4f(1.0, 1.0, 1.0, 1.0);
+			if(ibuf->rect)
+				glaDrawPixelsTex(x, y, ibuf->x, ibuf->y, GL_UNSIGNED_BYTE, ibuf->rect);
+			else if(ibuf->channels==4)
+				glaDrawPixelsTex(x, y, ibuf->x, ibuf->y, GL_FLOAT, ibuf->rect_float);
+
+			glPixelZoom(1.0, 1.0);
+
+			glMatrixMode(GL_PROJECTION);
+			glPopMatrix();
+			glMatrixMode(GL_MODELVIEW);
+			glPopMatrix();
+		}
+	}
+}
+#endif
+
+
+#endif
+
+void node_draw_link_bezier(View2D *v2d, float vec[4][3], int th_col1, int th_col2, int do_shaded)
+{
+	float dist;
+	
+	dist= 0.5f*ABS(vec[0][0] - vec[3][0]);
+	
+	
+	/* check direction later, for top sockets */
+	vec[1][0]= vec[0][0]+dist;
+	vec[1][1]= vec[0][1];
+	
+	vec[2][0]= vec[3][0]-dist;
+	vec[2][1]= vec[3][1];
+	// printf("-> %f   %f   %f   %f   %f\n", dist, vec[0][0], vec[3][0], vec[1][0], vec[2][0]);
+	
+	if( MIN4(vec[0][0], vec[1][0], vec[2][0], vec[3][0]) > v2d->cur.xmax); /* clipped */	
+	else if ( MAX4(vec[0][0], vec[1][0], vec[2][0], vec[3][0]) < v2d->cur.xmin); /* clipped */
+	else {
+		float curve_res = 24, spline_step = 0.0f;
+		
+		/* we can reuse the dist variable here to increment the GL curve eval amount*/
+		dist = 1.0f/curve_res;
+		
+		glMap1f(GL_MAP1_VERTEX_3, 0.0, 1.0, 3, 4, vec[0]);
+		glBegin(GL_LINE_STRIP);
+		while (spline_step < 1.000001f) {
+			if(do_shaded)
+				UI_ThemeColorBlend(th_col1, th_col2, spline_step);
+			glEvalCoord1f(spline_step);
+			spline_step += dist;
+		}
+		glEnd();
+	}
+	
+}
+
+/* note; this is used for fake links in groups too */
+void node_draw_link(View2D *v2d, SpaceNode *snode, bNodeLink *link)
+{
+	float vec[4][3];
+	float mx=0.0f, my=0.0f;
+	int do_shaded= 1, th_col1= TH_WIRE, th_col2= TH_WIRE;
+	
+	if(link->fromnode==NULL && link->tonode==NULL)
+		return;
+	
+	/* XXX fix -> notifier thingymajiggle this is dragging link */
+	if(link->fromnode==NULL || link->tonode==NULL) {
+		// short mval[2];
+		// XXX getmouseco_areawin(mval);
+		// XXX areamouseco_to_ipoco(v2d, mval, &mx, &my);
+		UI_ThemeColor(TH_WIRE);
+		do_shaded= 0;
+	}
+	else {
+		/* going to give issues once... */
+		if(link->tosock->flag & SOCK_UNAVAIL)
+			return;
+		if(link->fromsock->flag & SOCK_UNAVAIL)
+			return;
+		
+		/* a bit ugly... but thats how we detect the internal group links */
+		if(link->fromnode==link->tonode) {
+			UI_ThemeColorBlend(TH_BACK, TH_WIRE, 0.25f);
+			do_shaded= 0;
+		}
+		else {
+			/* check cyclic */
+			if(link->fromnode->level >= link->tonode->level && link->tonode->level!=0xFFF) {
+				if(link->fromnode->flag & SELECT)
+					th_col1= TH_EDGE_SELECT;
+				if(link->tonode->flag & SELECT)
+					th_col2= TH_EDGE_SELECT;
+			}				
+			else {
+				UI_ThemeColor(TH_REDALERT);
+				do_shaded= 0;
+			}
+		}
+	}
+	
+	vec[0][2]= vec[1][2]= vec[2][2]= vec[3][2]= 0.0; /* only 2d spline, set the Z to 0*/
+	
+	/* in v0 and v3 we put begin/end points */
+	if(link->fromnode) {
+		vec[0][0]= link->fromsock->locx;
+		vec[0][1]= link->fromsock->locy;
+	}
+	else {
+		vec[0][0]= mx;
+		vec[0][1]= my;
+	}
+	if(link->tonode) {
+		vec[3][0]= link->tosock->locx;
+		vec[3][1]= link->tosock->locy;
+	}
+	else {
+		vec[3][0]= mx;
+		vec[3][1]= my;
+	}
+	
+	node_draw_link_bezier(v2d, vec, th_col1, th_col2, do_shaded);
+	// fdrawbezier(vec);
+}
+
+#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
diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c
new file mode 100644
index 00000000000..ca522678c20
--- /dev/null
+++ b/source/blender/editors/space_node/node_draw.c
@@ -0,0 +1,1158 @@
+/**
+ * $Id: drawnode.c 17439 2008-11-13 09:57:11Z kakbarnf $
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version. 
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * The Original Code is Copyright (C) 2008 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ * Contributor(s): Nathan Letwory
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include <math.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "DNA_ID.h"
+#include "DNA_node_types.h"
+#include "DNA_image_types.h"
+#include "DNA_material_types.h"
+#include "DNA_mesh_types.h"
+#include "DNA_action_types.h"
+#include "DNA_color_types.h"
+#include "DNA_customdata_types.h"
+#include "DNA_gpencil_types.h"
+#include "DNA_ipo_types.h"
+#include "DNA_object_types.h"
+#include "DNA_scene_types.h"
+#include "DNA_space_types.h"
+#include "DNA_screen_types.h"
+#include "DNA_texture_types.h"
+#include "DNA_text_types.h"
+#include "DNA_userdef_types.h"
+
+#include "BLI_blenlib.h"
+#include "BLI_arithb.h"
+#include "MEM_guardedalloc.h"
+
+#include "BKE_context.h"
+#include "BKE_global.h"
+#include "BKE_image.h"
+#include "BKE_library.h"
+#include "BKE_main.h"
+#include "BKE_material.h"
+#include "BKE_node.h"
+#include "BKE_object.h"
+#include "BKE_texture.h"
+#include "BKE_text.h"
+#include "BKE_utildefines.h"
+
+/* #include "BDR_gpencil.h" XXX */
+
+#include "BIF_gl.h"
+#include "BIF_glutil.h"
+#include "BMF_Api.h"
+
+#include "WM_api.h"
+
+#include "ED_screen.h"
+#include "ED_util.h"
+#include "ED_types.h"
+
+#include "UI_text.h"
+#include "UI_interface.h"
+#include "UI_interface_icons.h"
+#include "UI_resources.h"
+#include "UI_view2d.h"
+
+#include "CMP_node.h"
+#include "SHD_node.h"
+
+#include "node_intern.h"
+
+// XXX from BSE_node.h
+#define HIDDEN_RAD		15.0f
+#define BASIS_RAD		8.0f
+#define NODE_DYS		10
+#define NODE_DY			20
+#define NODE_SOCKSIZE	5
+
+// XXX interface.h
+extern void ui_dropshadow(rctf *rct, float radius, float aspect, int select);
+extern void ui_rasterpos_safe(float x, float y, float aspect);
+extern void gl_round_box(int mode, float minx, float miny, float maxx, float maxy, float rad);
+void ui_draw_tria_icon(float x, float y, float aspect, char dir) {}
+
+// XXX butspace.h
+#define B_NODE_EXEC			3610
+
+static void snode_drawstring(void *curfont, SpaceNode *snode, char *str, int okwidth)
+{
+#if 0 // XXX
+	char drawstr[NODE_MAXSTR];
+	int width;
+	
+	if(str[0]==0 || okwidth<4) return;
+	
+	BLI_strncpy(drawstr, str, NODE_MAXSTR);
+	width= snode->aspect*UI_GetStringWidth(curfont, drawstr, 0);
+
+	if(width > okwidth) {
+		int len= strlen(drawstr)-1;
+		
+		while(width > okwidth && len>=0) {
+			drawstr[len]= 0;
+			
+			width= snode->aspect*UI_GetStringWidth(curfont, drawstr, 0);
+			len--;
+		}
+		if(len==0) return;
+	}
+	UI_DrawString(curfont, drawstr, 0);
+#endif
+}
+
+static void node_scaling_widget(int color_id, float aspect, float xmin, float ymin, float xmax, float ymax)
+{
+	float dx;
+	float dy;
+	
+	dx= 0.5f*(xmax-xmin);
+	dy= 0.5f*(ymax-ymin);
+	
+	UI_ThemeColorShade(color_id, +30);	
+	fdrawline(xmin, ymin, xmax, ymax);
+	fdrawline(xmin+dx, ymin, xmax, ymax-dy);
+	
+	UI_ThemeColorShade(color_id, -10);
+	fdrawline(xmin, ymin+aspect, xmax, ymax+aspect);
+	fdrawline(xmin+dx, ymin+aspect, xmax, ymax-dy+aspect);
+}
+
+/* based on settings in node, sets drawing rect info. each redraw! */
+static void node_update(bNode *node)
+{
+	bNodeSocket *nsock;
+	float dy= node->locy;
+	
+	/* header */
+	dy-= NODE_DY;
+	
+	/* little bit space in top */
+	if(node->outputs.first)
+		dy-= NODE_DYS/2;
+	
+	/* output sockets */
+	for(nsock= node->outputs.first; nsock; nsock= nsock->next) {
+		if(!(nsock->flag & (SOCK_HIDDEN|SOCK_UNAVAIL))) {
+			nsock->locx= node->locx + node->width;
+			nsock->locy= dy - NODE_DYS;
+			dy-= NODE_DY;
+		}
+	}
+	
+	node->prvr.xmin= node->butr.xmin= node->locx + NODE_DYS;
+	node->prvr.xmax= node->butr.xmax= node->locx + node->width- NODE_DYS;
+	
+	/* preview rect? */
+	if(node->flag & NODE_PREVIEW) {
+		/* only recalculate size when there's a preview actually, otherwise we use stored result */
+		if(node->preview && node->preview->rect) {
+			float aspect= 1.0f;
+			
+			if(node->preview && node->preview->xsize && node->preview->ysize) 
+				aspect= (float)node->preview->ysize/(float)node->preview->xsize;
+			
+			dy-= NODE_DYS/2;
+			node->prvr.ymax= dy;
+			
+			if(aspect <= 1.0f)
+				node->prvr.ymin= dy - aspect*(node->width-NODE_DY);
+			else {
+				float dx= (node->width - NODE_DYS) - (node->width- NODE_DYS)/aspect;	/* width correction of image */
+				
+				node->prvr.ymin= dy - (node->width-NODE_DY);
+				
+				node->prvr.xmin+= 0.5f*dx;
+				node->prvr.xmax-= 0.5f*dx;
+			}
+
+			dy= node->prvr.ymin - NODE_DYS/2;
+
+			/* make sure that maximums are bigger or equal to minimums */
+			if(node->prvr.xmax < node->prvr.xmin) SWAP(float, node->prvr.xmax, node->prvr.xmin);
+			if(node->prvr.ymax < node->prvr.ymin) SWAP(float, node->prvr.ymax, node->prvr.ymin);
+		}
+		else {
+			float oldh= node->prvr.ymax - node->prvr.ymin;
+			if(oldh==0.0f)
+				oldh= 0.6f*node->width-NODE_DY;
+			dy-= NODE_DYS/2;
+			node->prvr.ymax= dy;
+			node->prvr.ymin= dy - oldh;
+			dy= node->prvr.ymin - NODE_DYS/2;
+		}
+	}
+
+	/* XXX ugly hack, typeinfo for group is generated */
+	if(node->type == NODE_GROUP)
+		; // XXX node->typeinfo->butfunc= node_buts_group;
+	
+	/* buttons rect? */
+	if((node->flag & NODE_OPTIONS) && node->typeinfo->butfunc) {
+		dy-= NODE_DYS/2;
+		node->butr.ymax= dy;
+		node->butr.ymin= dy - (float)node->typeinfo->butfunc(NULL, NULL, node, NULL);
+		dy= node->butr.ymin - NODE_DYS/2;
+	}
+	
+	/* input sockets */
+	for(nsock= node->inputs.first; nsock; nsock= nsock->next) {
+		if(!(nsock->flag & (SOCK_HIDDEN|SOCK_UNAVAIL))) {
+			nsock->locx= node->locx;
+			nsock->locy= dy - NODE_DYS;
+			dy-= NODE_DY;
+		}
+	}
+	
+	/* little bit space in end */
+	if(node->inputs.first || (node->flag & (NODE_OPTIONS|NODE_PREVIEW))==0 )
+		dy-= NODE_DYS/2;
+	
+	node->totr.xmin= node->locx;
+	node->totr.xmax= node->locx + node->width;
+	node->totr.ymax= node->locy;
+	node->totr.ymin= dy;
+}
+
+/* based on settings in node, sets drawing rect info. each redraw! */
+static void node_update_hidden(bNode *node)
+{
+	bNodeSocket *nsock;
+	float rad, drad, hiddenrad= HIDDEN_RAD;
+	int totin=0, totout=0, tot;
+	
+	/* calculate minimal radius */
+	for(nsock= node->inputs.first; nsock; nsock= nsock->next)
+		if(!(nsock->flag & (SOCK_HIDDEN|SOCK_UNAVAIL)))
+			totin++;
+	for(nsock= node->outputs.first; nsock; nsock= nsock->next)
+		if(!(nsock->flag & (SOCK_HIDDEN|SOCK_UNAVAIL)))
+			totout++;
+	
+	tot= MAX2(totin, totout);
+	if(tot>4) {
+		hiddenrad += 5.0f*(float)(tot-4);
+	}
+	
+	node->totr.xmin= node->locx;
+	node->totr.xmax= node->locx + 3*hiddenrad + node->miniwidth;
+	node->totr.ymax= node->locy + (hiddenrad - 0.5f*NODE_DY);
+	node->totr.ymin= node->totr.ymax - 2*hiddenrad;
+	
+	/* output sockets */
+	rad=drad= (float)M_PI/(1.0f + (float)totout);
+	
+	for(nsock= node->outputs.first; nsock; nsock= nsock->next) {
+		if(!(nsock->flag & (SOCK_HIDDEN|SOCK_UNAVAIL))) {
+			nsock->locx= node->totr.xmax - hiddenrad + (float)sin(rad)*hiddenrad;
+			nsock->locy= node->totr.ymin + hiddenrad + (float)cos(rad)*hiddenrad;
+			rad+= drad;
+		}
+	}
+	
+	/* input sockets */
+	rad=drad= - (float)M_PI/(1.0f + (float)totin);
+	
+	for(nsock= node->inputs.first; nsock; nsock= nsock->next) {
+		if(!(nsock->flag & (SOCK_HIDDEN|SOCK_UNAVAIL))) {
+			nsock->locx= node->totr.xmin + hiddenrad + (float)sin(rad)*hiddenrad;
+			nsock->locy= node->totr.ymin + hiddenrad + (float)cos(rad)*hiddenrad;
+			rad+= drad;
+		}
+	}
+}
+
+static int node_get_colorid(bNode *node)
+{
+	if(node->typeinfo->nclass==NODE_CLASS_INPUT)
+		return TH_NODE_IN_OUT;
+	if(node->typeinfo->nclass==NODE_CLASS_OUTPUT) {
+		if(node->flag & NODE_DO_OUTPUT)
+			return TH_NODE_IN_OUT;
+		else
+			return TH_NODE;
+	}
+	if(node->typeinfo->nclass==NODE_CLASS_CONVERTOR)
+		return TH_NODE_CONVERTOR;
+	if(ELEM3(node->typeinfo->nclass, NODE_CLASS_OP_COLOR, NODE_CLASS_OP_VECTOR, NODE_CLASS_OP_FILTER))
+		return TH_NODE_OPERATOR;
+	if(node->typeinfo->nclass==NODE_CLASS_GROUP)
+		return TH_NODE_GROUP;
+	return TH_NODE;
+}
+
+/* based on settings in node, sets drawing rect info. each redraw! */
+/* note: this assumes only 1 group at a time is drawn (linked data) */
+/* in node->totr the entire boundbox for the group is stored */
+static void node_update_group(bNode *gnode)
+{
+	bNodeTree *ngroup= (bNodeTree *)gnode->id;
+	bNode *node;
+	bNodeSocket *nsock;
+	rctf *rect= &gnode->totr;
+	int counter;
+	
+	/* center them, is a bit of abuse of locx and locy though */
+	for(node= ngroup->nodes.first; node; node= node->next) {
+		node->locx+= gnode->locx;
+		node->locy+= gnode->locy;
+		if(node->flag & NODE_HIDDEN)
+			node_update_hidden(node);
+		else
+			node_update(node);
+		node->locx-= gnode->locx;
+		node->locy-= gnode->locy;
+	}
+	counter= 1;
+	for(node= ngroup->nodes.first; node; node= node->next) {
+		if(counter) {
+			*rect= node->totr;
+			counter= 0;
+		}
+		else
+			BLI_union_rctf(rect, &node->totr);
+	}
+	if(counter==1) return;	/* should be prevented? */
+	
+	rect->xmin-= NODE_DY;
+	rect->ymin-= NODE_DY;
+	rect->xmax+= NODE_DY;
+	rect->ymax+= NODE_DY;
+	
+	/* output sockets */
+	for(nsock= gnode->outputs.first; nsock; nsock= nsock->next) {
+		nsock->locx= rect->xmax;
+		nsock->locy= nsock->tosock->locy;
+	}
+	
+	/* input sockets */
+	for(nsock= gnode->inputs.first; nsock; nsock= nsock->next) {
+		nsock->locx= rect->xmin;
+		nsock->locy= nsock->tosock->locy;
+	}
+}
+
+/* note: in cmp_util.c is similar code, for node_compo_pass_on() */
+static void node_draw_mute_line(View2D *v2d, SpaceNode *snode, bNode *node)
+{
+	bNodeSocket *valsock= NULL, *colsock= NULL, *vecsock= NULL;
+	bNodeSocket *sock;
+	float vec[4][3];
+	int a;
+	
+	vec[0][2]= vec[1][2]= vec[2][2]= vec[3][2]= 0.0; /* only 2d spline, set the Z to 0*/
+	
+	/* connect the first value buffer in with first value out */
+	/* connect the first RGBA buffer in with first RGBA out */
+	
+	/* test the inputs */
+	for(a=0, sock= node->inputs.first; sock; sock= sock->next, a++) {
+		if(nodeCountSocketLinks(snode->edittree, sock)) {
+			if(sock->type==SOCK_VALUE && valsock==NULL) valsock= sock;
+			if(sock->type==SOCK_VECTOR && vecsock==NULL) vecsock= sock;
+			if(sock->type==SOCK_RGBA && colsock==NULL) colsock= sock;
+		}
+	}
+	
+	/* outputs, draw lines */
+	UI_ThemeColor(TH_REDALERT);
+	glEnable(GL_BLEND);
+	glEnable( GL_LINE_SMOOTH );
+	
+	if(valsock || colsock || vecsock) {
+		for(a=0, sock= node->outputs.first; sock; sock= sock->next, a++) {
+			if(nodeCountSocketLinks(snode->edittree, sock)) {
+				vec[3][0]= sock->locx;
+				vec[3][1]= sock->locy;
+				
+				if(sock->type==SOCK_VALUE && valsock) {
+					vec[0][0]= valsock->locx;
+					vec[0][1]= valsock->locy;
+					node_draw_link_bezier(v2d, vec, TH_WIRE, TH_WIRE, 0);
+					valsock= NULL;
+				}
+				if(sock->type==SOCK_VECTOR && vecsock) {
+					vec[0][0]= vecsock->locx;
+					vec[0][1]= vecsock->locy;
+					node_draw_link_bezier(v2d, vec, TH_WIRE, TH_WIRE, 0);
+					vecsock= NULL;
+				}
+				if(sock->type==SOCK_RGBA && colsock) {
+					vec[0][0]= colsock->locx;
+					vec[0][1]= colsock->locy;
+					node_draw_link_bezier(v2d, vec, TH_WIRE, TH_WIRE, 0);
+					colsock= NULL;
+				}
+			}
+		}
+	}
+	glDisable(GL_BLEND);
+	glDisable( GL_LINE_SMOOTH );
+}
+
+/* nice AA filled circle */
+/* this might have some more generic use */
+static void circle_draw(float x, float y, float size, int type, int col[3])
+{
+	/* 16 values of sin function */
+	static float si[16] = {
+		0.00000000f, 0.39435585f,0.72479278f,0.93775213f,
+		0.99871650f,0.89780453f,0.65137248f,0.29936312f,
+		-0.10116832f,-0.48530196f,-0.79077573f,-0.96807711f,
+		-0.98846832f,-0.84864425f,-0.57126821f,-0.20129852f
+	};
+	/* 16 values of cos function */
+	static float co[16] ={
+		1.00000000f,0.91895781f,0.68896691f,0.34730525f,
+		-0.05064916f,-0.44039415f,-0.75875812f,-0.95413925f,
+		-0.99486932f,-0.87434661f,-0.61210598f,-0.25065253f,
+		0.15142777f,0.52896401f,0.82076344f,0.97952994f,
+	};
+	int a;
+	
+	glColor3ub(col[0], col[1], col[2]);
+	
+	glBegin(GL_POLYGON);
+	for(a=0; a<16; a++)
+		glVertex2f(x+size*si[a], y+size*co[a]);
+	glEnd();
+	
+	glColor4ub(0, 0, 0, 150);
+	glEnable(GL_BLEND);
+	glEnable( GL_LINE_SMOOTH );
+	glBegin(GL_LINE_LOOP);
+	for(a=0; a<16; a++)
+		glVertex2f(x+size*si[a], y+size*co[a]);
+	glEnd();
+	glDisable( GL_LINE_SMOOTH );
+	glDisable(GL_BLEND);
+}
+
+static void socket_circle_draw(bNodeSocket *sock, float size)
+{
+	int col[3];
+	
+	/* choose color based on sock flags */
+	if(sock->flag & SELECT) {
+		if(sock->flag & SOCK_SEL) {
+			col[0]= 240; col[1]= 200; col[2]= 40;}
+		else if(sock->type==SOCK_VALUE) {
+			col[0]= 200; col[1]= 200; col[2]= 200;}
+		else if(sock->type==SOCK_VECTOR) {
+			col[0]= 140; col[1]= 140; col[2]= 240;}
+		else if(sock->type==SOCK_RGBA) {
+			col[0]= 240; col[1]= 240; col[2]= 100;}
+		else {
+			col[0]= 140; col[1]= 240; col[2]= 140;}
+	}
+	else if(sock->flag & SOCK_SEL) {
+		col[0]= 200; col[1]= 160; col[2]= 0;}
+	else {
+		if(sock->type==-1) {
+			col[0]= 0; col[1]= 0; col[2]= 0;}
+		else if(sock->type==SOCK_VALUE) {
+			col[0]= 160; col[1]= 160; col[2]= 160;}
+		else if(sock->type==SOCK_VECTOR) {
+			col[0]= 100; col[1]= 100; col[2]= 200;}
+		else if(sock->type==SOCK_RGBA) {
+			col[0]= 200; col[1]= 200; col[2]= 40;}
+		else { 
+			col[0]= 100; col[1]= 200; col[2]= 100;}
+	}
+	
+	circle_draw(sock->locx, sock->locy, size, sock->type, col);
+}
+
+static void node_sync_cb(bContext *C, void *snode_v, void *node_v)
+{
+	SpaceNode *snode= snode_v;
+	
+	if(snode->treetype==NTREE_SHADER) {
+		nodeShaderSynchronizeID(node_v, 1);
+		// allqueue(REDRAWBUTSSHADING, 0);
+	}
+}
+
+/* **************  Socket callbacks *********** */
+
+static void socket_vector_menu_cb(bContext *C, void *node_v, void *ntree_v)
+{
+	if(node_v && ntree_v) {
+		NodeTagChanged(ntree_v, node_v); 
+		// addqueue(curarea->win, UI_BUT_EVENT, B_NODE_EXEC+((bNode *)node_v)->nr); XXX
+	}
+}
+
+/* NOTE: this is a block-menu, needs 0 events, otherwise the menu closes */
+static uiBlock *socket_vector_menu(bContext *C, uiMenuBlockHandle *handle, void *socket_v)
+{
+#if 0 //XXX
+	SpaceNode *snode= curarea->spacedata.first;
+	bNode *node;
+	bNodeSocket *sock= socket_v;
+	bNodeStack *ns= &sock->ns;
+	uiBlock *block;
+	uiBut *bt;
+	
+	/* a bit ugly... retrieve the node the socket comes from */
+	for(node= snode->nodetree->nodes.first; node; node= node->next) {
+		bNodeSocket *sockt;
+		for(sockt= node->inputs.first; sockt; sockt= sockt->next)
+			if(sockt==sock)
+				break;
+		if(sockt)
+			break;
+	}
+	
+	block= uiNewBlock(&curarea->uiblocks, "socket menu", UI_EMBOSS, UI_HELV, curarea->win);
+
+	/* use this for a fake extra empy space around the buttons */
+	uiDefBut(block, LABEL, 0, "",			-4, -4, 188, 68, NULL, 0, 0, 0, 0, "");
+	
+	uiBlockBeginAlign(block);
+	bt= uiDefButF(block, NUMSLI, 0, "X ",	 0,40,180,20, ns->vec, ns->min, ns->max, 10, 0, "");
+	uiButSetFunc(bt, socket_vector_menu_cb, node, snode->nodetree);
+	bt= uiDefButF(block, NUMSLI, 0, "Y ",	 0,20,180,20, ns->vec+1, ns->min, ns->max, 10, 0, "");
+	uiButSetFunc(bt, socket_vector_menu_cb, node, snode->nodetree);
+	bt= uiDefButF(block, NUMSLI, 0, "Z ",	 0,0,180,20, ns->vec+2, ns->min, ns->max, 10, 0, "");
+	uiButSetFunc(bt, socket_vector_menu_cb, node, snode->nodetree);
+	
+	uiBlockSetDirection(block, UI_TOP);
+	
+	// allqueue(REDRAWNODE, 0);
+	
+	return block;
+#endif
+return NULL;
+}
+
+/* not a callback */
+static void node_draw_preview(bNodePreview *preview, rctf *prv)
+{
+	float xscale= (prv->xmax-prv->xmin)/((float)preview->xsize);
+	float yscale= (prv->ymax-prv->ymin)/((float)preview->ysize);
+	float tile= (prv->xmax - prv->xmin) / 10.0f;
+	float x, y;
+	
+	/* draw checkerboard backdrop to show alpha */
+	glColor3ub(120, 120, 120);
+	glRectf(prv->xmin, prv->ymin, prv->xmax, prv->ymax);
+	glColor3ub(160, 160, 160);
+	
+	for(y=prv->ymin; y<prv->ymax; y+=tile*2) {
+		for(x=prv->xmin; x<prv->xmax; x+=tile*2) {
+			float tilex= tile, tiley= tile;
+
+			if(x+tile > prv->xmax)
+				tilex= prv->xmax-x;
+			if(y+tile > prv->ymax)
+				tiley= prv->ymax-y;
+
+			glRectf(x, y, x + tilex, y + tiley);
+		}
+	}
+	for(y=prv->ymin+tile; y<prv->ymax; y+=tile*2) {
+		for(x=prv->xmin+tile; x<prv->xmax; x+=tile*2) {
+			float tilex= tile, tiley= tile;
+
+			if(x+tile > prv->xmax)
+				tilex= prv->xmax-x;
+			if(y+tile > prv->ymax)
+				tiley= prv->ymax-y;
+
+			glRectf(x, y, x + tilex, y + tiley);
+		}
+	}
+	
+#ifdef __APPLE__
+	if(is_a_really_crappy_nvidia_card()) {
+		float zoomx= curarea->winx/(float)(G.v2d->cur.xmax-G.v2d->cur.xmin);
+		float zoomy= curarea->winy/(float)(G.v2d->cur.ymax-G.v2d->cur.ymin);
+		glPixelZoom(zoomx*xscale, zoomy*yscale);
+	}
+	else
+#endif
+		glPixelZoom(xscale, yscale);
+
+	glEnable(GL_BLEND);
+	glBlendFunc( GL_ONE, GL_ONE_MINUS_SRC_ALPHA );	/* premul graphics */
+	
+	glColor4f(1.0, 1.0, 1.0, 1.0);
+	glaDrawPixelsTex(prv->xmin, prv->ymin, preview->xsize, preview->ysize, GL_FLOAT, preview->rect);
+	
+	glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
+	glDisable(GL_BLEND);
+	glPixelZoom(1.0f, 1.0f);
+
+	UI_ThemeColorShadeAlpha(TH_BACK, -15, +100);
+	fdrawbox(prv->xmin, prv->ymin, prv->xmax, prv->ymax);
+	
+}
+
+static void node_draw_basis(const bContext *C, ARegion *ar, SpaceNode *snode, bNode *node)
+{
+	bNodeSocket *sock;
+	uiBlock *block= NULL;
+	uiBut *bt;
+	rctf *rct= &node->totr;
+	float /*slen,*/ iconofs;
+	int /*ofs,*/ color_id= node_get_colorid(node);
+	char showname[128]; /* 128 used below */
+	View2D *v2d = &ar->v2d;
+	
+	uiSetRoundBox(15-4);
+	ui_dropshadow(rct, BASIS_RAD, snode->aspect, node->flag & SELECT);
+	
+	/* header */
+	if(color_id==TH_NODE)
+		UI_ThemeColorShade(color_id, -20);
+	else
+		UI_ThemeColor(color_id);
+		
+	uiSetRoundBox(3);
+	uiRoundBox(rct->xmin, rct->ymax-NODE_DY, rct->xmax, rct->ymax, BASIS_RAD);
+	
+	/* show/hide icons, note this sequence is copied in editnode.c */
+	iconofs= rct->xmax;
+	
+	if(node->typeinfo->flag & NODE_PREVIEW) {
+		int icon_id;
+		
+		if(node->flag & (NODE_ACTIVE_ID|NODE_DO_OUTPUT))
+			icon_id= ICON_MATERIAL;
+		else
+			icon_id= ICON_MATERIAL_DEHLT;
+		iconofs-= 18.0f;
+		glEnable(GL_BLEND);
+		UI_icon_draw_aspect_blended(iconofs, rct->ymax-NODE_DY+2, icon_id, snode->aspect, -60);
+		glDisable(GL_BLEND);
+	}
+	if(node->type == NODE_GROUP) {
+		
+		iconofs-= 18.0f;
+		glEnable(GL_BLEND);
+		if(node->id->lib) {
+			glPixelTransferf(GL_GREEN_SCALE, 0.7f);
+			glPixelTransferf(GL_BLUE_SCALE, 0.3f);
+			UI_icon_draw_aspect(iconofs, rct->ymax-NODE_DY+2, ICON_NODE, snode->aspect);
+			glPixelTransferf(GL_GREEN_SCALE, 1.0f);
+			glPixelTransferf(GL_BLUE_SCALE, 1.0f);
+		}
+		else {
+			UI_icon_draw_aspect_blended(iconofs, rct->ymax-NODE_DY+2, ICON_NODE, snode->aspect, -60);
+		}
+		glDisable(GL_BLEND);
+	}
+	if(node->typeinfo->flag & NODE_OPTIONS) {
+		iconofs-= 18.0f;
+		glEnable(GL_BLEND);
+		UI_icon_draw_aspect_blended(iconofs, rct->ymax-NODE_DY+2, ICON_BUTS, snode->aspect, -60);
+		glDisable(GL_BLEND);
+	}
+	{	/* always hide/reveil unused sockets */ 
+		int shade;
+
+		iconofs-= 18.0f;
+		// XXX re-enable
+		/*if(node_has_hidden_sockets(node))
+			shade= -40;
+		else*/
+			shade= -90;
+		glEnable(GL_BLEND);
+		UI_icon_draw_aspect_blended(iconofs, rct->ymax-NODE_DY+2, ICON_PLUS, snode->aspect, shade);
+		glDisable(GL_BLEND);
+	}
+	
+	/* title */
+	if(node->flag & SELECT) 
+		UI_ThemeColor(TH_TEXT_HI);
+	else
+		UI_ThemeColorBlendShade(TH_TEXT, color_id, 0.4f, 10);
+	
+	/* open/close entirely? */
+	ui_draw_tria_icon(rct->xmin+8.0f, rct->ymax-NODE_DY+4.0f, snode->aspect, 'v');
+	
+	if(node->flag & SELECT) 
+		UI_ThemeColor(TH_TEXT_HI);
+	else
+		UI_ThemeColor(TH_TEXT);
+	
+	// ui_rasterpos_safe(rct->xmin+19.0f, rct->ymax-NODE_DY+5.0f, snode->aspect);
+	
+	if(node->flag & NODE_MUTED)
+		sprintf(showname, "[%s]", node->name);
+	else if(node->username[0])
+		sprintf(showname, "(%s) %s", node->username, node->name);
+	else
+		BLI_strncpy(showname, node->name, 128);
+	
+	block= uiBeginBlock(C, ar, "snode_drawstring_hack", UI_EMBOSSN, UI_HELV);
+	// snode_drawstring(block->curfont, snode, showname, (int)(iconofs - rct->xmin-18.0f));
+	bt= uiDefBut(block, LABEL, 0, showname, (int)rct->xmin+19, (int)rct->ymax-NODE_DY+5, 100, 20, NULL, 0, 0, 0, 0, "");
+	uiEndBlock(C, block);
+	block= NULL;
+
+	/* body */
+	UI_ThemeColor4(TH_NODE);
+	glEnable(GL_BLEND);
+	uiSetRoundBox(8);
+	uiRoundBox(rct->xmin, rct->ymin, rct->xmax, rct->ymax-NODE_DY, BASIS_RAD);
+	glDisable(GL_BLEND);
+
+	/* scaling indicator */
+	node_scaling_widget(TH_NODE, snode->aspect, rct->xmax-BASIS_RAD*snode->aspect, rct->ymin, rct->xmax, rct->ymin+BASIS_RAD*snode->aspect);
+
+	/* outline active emphasis */
+	if(node->flag & NODE_ACTIVE) {
+		glEnable(GL_BLEND);
+		glColor4ub(200, 200, 200, 140);
+		uiSetRoundBox(15-4);
+		gl_round_box(GL_LINE_LOOP, rct->xmin, rct->ymin, rct->xmax, rct->ymax, BASIS_RAD);
+		glDisable(GL_BLEND);
+	}
+	
+	/* disable lines */
+	if(node->flag & NODE_MUTED)
+		node_draw_mute_line(v2d, snode, node);
+
+	/* we make buttons for input sockets, if... */
+	if(node->flag & NODE_OPTIONS) {
+		if(node->inputs.first || node->typeinfo->butfunc) {
+			char str[32];
+			
+			/* make unique block name, also used for handling blocks in editnode.c */
+			sprintf(str, "node buttons %p", node);
+			
+			//block= uiNewBlock(&sa->uiblocks, str, UI_EMBOSS, UI_HELV, sa->win);
+			block= uiBeginBlock(C, ar, str, UI_EMBOSS, UI_HELV);
+			uiBlockSetFlag(block, UI_BLOCK_NO_HILITE);
+			// XXX if(snode->id)
+			// XXX	uiSetButLock(snode->id->lib!=NULL, ERROR_LIBDATA_MESSAGE);
+		}
+	}
+	
+	/* hurmf... another candidate for callback, have to see how this works first */
+	if(node->id && block && snode->treetype==NTREE_SHADER)
+		nodeShaderSynchronizeID(node, 0);
+	
+	/* socket inputs, buttons */
+	for(sock= node->inputs.first; sock; sock= sock->next) {
+		if(!(sock->flag & (SOCK_HIDDEN|SOCK_UNAVAIL))) {
+			socket_circle_draw(sock, NODE_SOCKSIZE);
+			
+			if(block && sock->link==NULL) {
+				float *butpoin= sock->ns.vec;
+				
+				if(sock->type==SOCK_VALUE) {
+					bt= uiDefButF(block, NUM, B_NODE_EXEC+node->nr, sock->name, 
+						  (short)sock->locx+NODE_DYS, (short)(sock->locy)-9, (short)node->width-NODE_DY, 17, 
+						  butpoin, sock->ns.min, sock->ns.max, 10, 2, "");
+					uiButSetFunc(bt, node_sync_cb, snode, node);
+				}
+				else if(sock->type==SOCK_VECTOR) {
+					uiDefBlockBut(block, socket_vector_menu, sock, sock->name, 
+						  (short)sock->locx+NODE_DYS, (short)sock->locy-9, (short)node->width-NODE_DY, 17, 
+						  "");
+				}
+				else if(block && sock->type==SOCK_RGBA) {
+					short labelw= (short)node->width-NODE_DY-40, width;
+					
+					if(labelw>0) width= 40; else width= (short)node->width-NODE_DY;
+					
+					bt= uiDefButF(block, COL, B_NODE_EXEC+node->nr, "", 
+						(short)(sock->locx+NODE_DYS), (short)sock->locy-8, width, 15, 
+						   butpoin, 0, 0, 0, 0, "");
+					uiButSetFunc(bt, node_sync_cb, snode, node);
+					
+					if(labelw>0) uiDefBut(block, LABEL, 0, sock->name, 
+										   (short)(sock->locx+NODE_DYS) + 40, (short)sock->locy-8, labelw, 15, 
+										   NULL, 0, 0, 0, 0, "");
+				}
+			}
+			else {
+				/* XXX fix
+				UI_ThemeColor(TH_TEXT);
+				ui_rasterpos_safe(sock->locx+8.0f, sock->locy-5.0f, snode->aspect);
+				UI_DrawString(snode->curfont, sock->name, 0);
+				*/
+			}
+		}
+	}
+	
+	/* socket outputs */
+	for(sock= node->outputs.first; sock; sock= sock->next) {
+		if(!(sock->flag & (SOCK_HIDDEN|SOCK_UNAVAIL))) {
+			socket_circle_draw(sock, NODE_SOCKSIZE);
+			
+			/* XXX fix
+			UI_ThemeColor(TH_TEXT);
+			ofs= 0;
+			slen= snode->aspect*UI_GetStringWidth(snode->curfont, sock->name, 0);
+			while(slen > node->width) {
+				ofs++;
+				slen= snode->aspect*UI_GetStringWidth(snode->curfont, sock->name+ofs, 0);
+			}
+			ui_rasterpos_safe(sock->locx-8.0f-slen, sock->locy-5.0f, snode->aspect);
+			UI_DrawString(snode->curfont, sock->name+ofs, 0);
+			*/
+		}
+	}
+	
+	/* preview */
+	if(node->flag & NODE_PREVIEW)
+		if(node->preview && node->preview->rect)
+			node_draw_preview(node->preview, &node->prvr);
+		
+	/* buttons */
+	if(node->flag & NODE_OPTIONS) {
+		if(block) {
+			if(node->typeinfo->butfunc) {
+				node->typeinfo->butfunc(block, snode->nodetree, node, &node->butr);
+			}
+			uiDrawBlock(block);
+		}
+	}
+	
+	if(block)
+		uiEndBlock(C, block);
+}
+
+static void node_draw_hidden(View2D *v2d, SpaceNode *snode, bNode *node)
+{
+//	uiBlock *block; // XXX HACK
+	bNodeSocket *sock;
+	rctf *rct= &node->totr;
+	float dx, centy= 0.5f*(rct->ymax+rct->ymin);
+	float hiddenrad= 0.5f*(rct->ymax-rct->ymin);
+	int color_id= node_get_colorid(node);
+	char showname[128];	/* 128 is used below */
+	
+	/* shadow */
+	uiSetRoundBox(15);
+	ui_dropshadow(rct, hiddenrad, snode->aspect, node->flag & SELECT);
+
+	/* body */
+	UI_ThemeColor(color_id);	
+	uiRoundBox(rct->xmin, rct->ymin, rct->xmax, rct->ymax, hiddenrad);
+	
+	/* outline active emphasis */
+	if(node->flag & NODE_ACTIVE) {
+		glEnable(GL_BLEND);
+		glColor4ub(200, 200, 200, 140);
+		gl_round_box(GL_LINE_LOOP, rct->xmin, rct->ymin, rct->xmax, rct->ymax, hiddenrad);
+		glDisable(GL_BLEND);
+	}
+	
+	/* title */
+	if(node->flag & SELECT) 
+		UI_ThemeColor(TH_TEXT_HI);
+	else
+		UI_ThemeColorBlendShade(TH_TEXT, color_id, 0.4f, 10);
+	
+	/* open entirely icon */
+	ui_draw_tria_icon(rct->xmin+9.0f, centy-6.0f, snode->aspect, 'h');	
+	
+	/* disable lines */
+	if(node->flag & NODE_MUTED)
+		node_draw_mute_line(v2d, snode, node);	
+	
+	if(node->flag & SELECT) 
+		UI_ThemeColor(TH_TEXT_HI);
+	else
+		UI_ThemeColor(TH_TEXT);
+	
+	if(node->miniwidth>0.0f) {
+		ui_rasterpos_safe(rct->xmin+21.0f, centy-4.0f, snode->aspect);
+
+		if(node->flag & NODE_MUTED)
+			sprintf(showname, "[%s]", node->name);
+		else if(node->username[0])
+			sprintf(showname, "(%s)%s", node->username, node->name);
+		else
+			BLI_strncpy(showname, node->name, 128);
+
+		/* XXX 
+		block= uiBeginBlock(C, ar, "snode_drawstring_hack", UI_EMBOSSN, UI_HELV);
+		// snode_drawstring(block->curfont, snode, showname, (int)(iconofs - rct->xmin-18.0f));
+		bt= uiDefBut(block, LABEL, 0, showname, rct->xmin+21, centy-4, 100, 20, NULL, 0, 0, 0, 0, "");
+		uiEndBlock(C, block);
+		*/
+		
+	}	
+
+	/* scale widget thing */
+	UI_ThemeColorShade(color_id, -10);	
+	dx= 10.0f;
+	fdrawline(rct->xmax-dx, centy-4.0f, rct->xmax-dx, centy+4.0f);
+	fdrawline(rct->xmax-dx-3.0f*snode->aspect, centy-4.0f, rct->xmax-dx-3.0f*snode->aspect, centy+4.0f);
+	
+	UI_ThemeColorShade(color_id, +30);
+	dx-= snode->aspect;
+	fdrawline(rct->xmax-dx, centy-4.0f, rct->xmax-dx, centy+4.0f);
+	fdrawline(rct->xmax-dx-3.0f*snode->aspect, centy-4.0f, rct->xmax-dx-3.0f*snode->aspect, centy+4.0f);
+	
+	/* sockets */
+	for(sock= node->inputs.first; sock; sock= sock->next) {
+		if(!(sock->flag & (SOCK_HIDDEN|SOCK_UNAVAIL)))
+			socket_circle_draw(sock, NODE_SOCKSIZE);
+	}
+	
+	for(sock= node->outputs.first; sock; sock= sock->next) {
+		if(!(sock->flag & (SOCK_HIDDEN|SOCK_UNAVAIL)))
+			socket_circle_draw(sock, NODE_SOCKSIZE);
+	}
+}
+
+static void node_draw_nodetree(const bContext *C, ARegion *ar, SpaceNode *snode, bNodeTree *ntree)
+{
+	bNode *node;
+	bNodeLink *link;
+	int a;
+	
+	if(ntree==NULL) return;		/* groups... */
+	
+	/* node lines */
+	glEnable(GL_BLEND);
+	glEnable(GL_LINE_SMOOTH);
+	for(link= ntree->links.first; link; link= link->next)
+		node_draw_link(&ar->v2d, snode, link);
+	glDisable(GL_LINE_SMOOTH);
+	glDisable(GL_BLEND);
+	
+	/* not selected first */
+	for(a=0, node= ntree->nodes.first; node; node= node->next, a++) {
+		node->nr= a;		/* index of node in list, used for exec event code */
+		if(!(node->flag & SELECT)) {
+			if(node->flag & NODE_GROUP_EDIT);
+			else if(node->flag & NODE_HIDDEN)
+				node_draw_hidden(&ar->v2d, snode, node);
+			else
+				node_draw_basis(C, ar, snode, node);
+		}
+	}
+	
+	/* selected */
+	for(node= ntree->nodes.first; node; node= node->next) {
+		if(node->flag & SELECT) {
+			if(node->flag & NODE_GROUP_EDIT);
+			else if(node->flag & NODE_HIDDEN)
+				node_draw_hidden(&ar->v2d, snode, node);
+			else
+				node_draw_basis(C, ar, snode, node);
+		}
+	}	
+}
+
+/* fake links from groupnode to internal nodes */
+static void node_draw_group_links(View2D *v2d, SpaceNode *snode, bNode *gnode)
+{
+	bNodeLink fakelink;
+	bNodeSocket *sock;
+	
+	glEnable(GL_BLEND);
+	glEnable(GL_LINE_SMOOTH);
+	
+	fakelink.tonode= fakelink.fromnode= gnode;
+	
+	for(sock= gnode->inputs.first; sock; sock= sock->next) {
+		if(!(sock->flag & (SOCK_HIDDEN|SOCK_UNAVAIL))) {
+			if(sock->tosock) {
+				fakelink.fromsock= sock;
+				fakelink.tosock= sock->tosock;
+				node_draw_link(v2d, snode, &fakelink);
+			}
+		}
+	}
+	
+	for(sock= gnode->outputs.first; sock; sock= sock->next) {
+		if(!(sock->flag & (SOCK_HIDDEN|SOCK_UNAVAIL))) {
+			if(sock->tosock) {
+				fakelink.tosock= sock;
+				fakelink.fromsock= sock->tosock;
+				node_draw_link(v2d, snode, &fakelink);
+			}
+		}
+	}
+	
+	glDisable(GL_BLEND);
+	glDisable(GL_LINE_SMOOTH);
+}
+
+/* groups are, on creation, centered around 0,0 */
+static void node_draw_group(const bContext *C, ARegion *ar, SpaceNode *snode, bNode *gnode)
+{
+	bNodeTree *ngroup= (bNodeTree *)gnode->id;
+	bNodeSocket *sock;
+	rctf rect= gnode->totr;
+	char showname[128];
+	
+	/* backdrop header */
+	glEnable(GL_BLEND);
+	uiSetRoundBox(3);
+	UI_ThemeColorShadeAlpha(TH_NODE_GROUP, 0, -70);
+	gl_round_box(GL_POLYGON, rect.xmin, rect.ymax, rect.xmax, rect.ymax+NODE_DY, BASIS_RAD);
+	
+	/* backdrop body */
+	UI_ThemeColorShadeAlpha(TH_BACK, -8, -70);
+	uiSetRoundBox(12);
+	gl_round_box(GL_POLYGON, rect.xmin, rect.ymin, rect.xmax, rect.ymax, BASIS_RAD);
+	
+	/* selection outline */
+	uiSetRoundBox(15);
+	glColor4ub(200, 200, 200, 140);
+	glEnable( GL_LINE_SMOOTH );
+	gl_round_box(GL_LINE_LOOP, rect.xmin, rect.ymin, rect.xmax, rect.ymax+NODE_DY, BASIS_RAD);
+	glDisable( GL_LINE_SMOOTH );
+	glDisable(GL_BLEND);
+	
+	/* backdrop title */
+	UI_ThemeColor(TH_TEXT_HI);
+	ui_rasterpos_safe(rect.xmin+8.0f, rect.ymax+5.0f, snode->aspect);
+
+	if(gnode->username[0]) {
+		strcpy(showname,"(");
+		strcat(showname, gnode->username);
+		strcat(showname,") ");
+		strcat(showname, ngroup->id.name+2);
+	}
+	else
+		strcpy(showname, ngroup->id.name+2);
+
+	UI_DrawString(snode->curfont, showname, 0);
+	
+	/* links from groupsockets to the internal nodes */
+	node_draw_group_links(&ar->v2d, snode, gnode);
+	
+	/* group sockets */
+	for(sock= gnode->inputs.first; sock; sock= sock->next)
+		if(!(sock->flag & (SOCK_HIDDEN|SOCK_UNAVAIL)))
+			socket_circle_draw(sock, NODE_SOCKSIZE);
+	for(sock= gnode->outputs.first; sock; sock= sock->next)
+		if(!(sock->flag & (SOCK_HIDDEN|SOCK_UNAVAIL)))
+			socket_circle_draw(sock, NODE_SOCKSIZE);
+
+	/* and finally the whole tree */
+	node_draw_nodetree(C, ar, snode, ngroup);
+}
+
+void drawnodespace(const bContext *C, ARegion *ar, View2D *v2d)
+{
+	float col[3];
+	View2DScrollers *scrollers;
+	SpaceNode *snode= (SpaceNode*)CTX_wm_space_data(C);
+	
+	UI_GetThemeColor3fv(TH_BACK, col);
+	glClearColor(col[0], col[1], col[2], 0.0);
+	glClear(GL_COLOR_BUFFER_BIT);
+
+	UI_view2d_view_ortho(C, v2d);
+	
+	//bwin_clear_viewmat(sa->win);	/* clear buttons view */
+	//glLoadIdentity();
+	
+	/* always free, blocks here have no unique identifier (1 block per node) */
+	//uiFreeBlocksWin(&sa->uiblocks, sa->win);
+
+	/* only set once */
+	glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
+	glEnable(GL_MAP1_VERTEX_3);
+
+	/* aspect+font, set each time */
+	//snode->aspect= (snode->v2d.cur.xmax - snode->v2d.cur.xmin)/((float)sa->winx);
+	//snode->curfont= uiSetCurFont_ext(snode->aspect);
+
+	UI_view2d_constant_grid_draw(C, v2d);
+	/* backdrop */
+	// draw_nodespace_back_pix(sa, snode);
+	
+	/* nodes */
+	snode_set_context(snode, CTX_data_scene(C));
+	
+	if(snode->nodetree) {
+		bNode *node;
+		
+		/* for now, we set drawing coordinates on each redraw */
+		for(node= snode->nodetree->nodes.first; node; node= node->next) {
+			if(node->flag & NODE_GROUP_EDIT)
+				node_update_group(node);
+			else if(node->flag & NODE_HIDDEN)
+				node_update_hidden(node);
+			else
+				node_update(node);
+		}
+
+		node_draw_nodetree(C, ar, snode, snode->nodetree);
+			
+		/* active group */
+		for(node= snode->nodetree->nodes.first; node; node= node->next) {
+			if(node->flag & NODE_GROUP_EDIT)
+				node_draw_group(C, ar, snode, node);
+		}
+	}
+	
+	/* draw grease-pencil ('canvas' strokes) */
+	/*if ((snode->flag & SNODE_DISPGP) && (snode->nodetree))
+		draw_gpencil_2dview(sa, 1);*/
+	
+	/* restore viewport (not needed yet) */
+	/*mywinset(sa->win);*/
+
+	/* ortho at pixel level curarea */
+	/*myortho2(-0.375, sa->winx-0.375, -0.375, sa->winy-0.375);*/
+	
+	/* draw grease-pencil (screen strokes) */
+	/*if ((snode->flag & SNODE_DISPGP) && (snode->nodetree))
+		draw_gpencil_2dview(sa, 0);*/
+
+	//draw_area_emboss(sa);
+	
+	/* it is important to end a view in a transform compatible with buttons */
+	/*bwin_scalematrix(sa->win, snode->blockscale, snode->blockscale, snode->blockscale);
+	nodes_blockhandlers(sa);*/
+	
+	//curarea->win_swap= WIN_BACK_OK;
+	
+	/* in the end, this is a delayed previewrender test, to allow buttons to be first */
+	/*if(snode->flag & SNODE_DO_PREVIEW) {
+		addafterqueue(sa->win, RENDERPREVIEW, 1);
+		snode->flag &= ~SNODE_DO_PREVIEW;
+	}*/
+	
+	
+	
+	/* reset view matrix */
+	UI_view2d_view_restore(C);
+	
+	/* scrollers */
+	scrollers= UI_view2d_scrollers_calc(C, v2d, 10/*unit*/, V2D_GRID_CLAMP, V2D_ARG_DUMMY, V2D_ARG_DUMMY);
+	UI_view2d_scrollers_draw(C, v2d, scrollers);
+	UI_view2d_scrollers_free(scrollers);
+}
\ No newline at end of file
diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c
new file mode 100644
index 00000000000..ac6cda921ab
--- /dev/null
+++ b/source/blender/editors/space_node/node_edit.c
@@ -0,0 +1,2704 @@
+/**
+ * $Id:
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version. 
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * The Original Code is Copyright (C) 2005 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): David Millan Escriva, Juho Vepsäläinen
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+#include <string.h>
+
+#include "MEM_guardedalloc.h"
+
+#include "DNA_action_types.h"
+#include "DNA_color_types.h"
+#include "DNA_image_types.h"
+#include "DNA_ipo_types.h"
+#include "DNA_object_types.h"
+#include "DNA_material_types.h"
+#include "DNA_texture_types.h"
+#include "DNA_node_types.h"
+#include "DNA_space_types.h"
+#include "DNA_screen_types.h"
+#include "DNA_scene_types.h"
+#include "DNA_userdef_types.h"
+
+#include "BKE_context.h"
+#include "BKE_colortools.h"
+#include "BKE_global.h"
+#include "BKE_image.h"
+#include "BKE_library.h"
+#include "BKE_main.h"
+#include "BKE_node.h"
+#include "BKE_material.h"
+#include "BKE_texture.h"
+#include "BKE_scene.h"
+#include "BKE_utildefines.h"
+
+#include "ED_previewrender.h"
+
+#include "BIF_gl.h"
+/*#include "BIF_cursors.h"
+#include "BIF_editview.h"
+#include "BIF_graphics.h"
+#include "BIF_imasel.h"
+#include "BIF_interface.h"
+#include "BIF_mywindow.h"
+#include "BIF_previewrender.h"
+#include "BIF_resources.h"
+#include "BIF_renderwin.h"
+#include "BIF_space.h"
+#include "BIF_scrarea.h"
+#include "BIF_screen.h"
+#include "BIF_toolbox.h"
+*/
+
+/*#include "BSE_drawipo.h"
+#include "BSE_edit.h"
+#include "BSE_filesel.h"
+#include "BSE_headerbuttons.h"
+#include "BSE_node.h"*/
+
+#include "BLI_arithb.h"
+#include "BLI_blenlib.h"
+#include "BLI_storage_types.h"
+
+/*#include "BDR_editobject.h"
+#include "BDR_gpencil.h"*/
+
+#include "RE_pipeline.h"
+#include "IMB_imbuf_types.h"
+
+/*#include "blendef.h"
+#include "butspace.h"
+#include "PIL_time.h"
+#include "mydevice.h"
+#include "winlay.h"
+*/
+#if 0
+/* currently called from BIF_preview_changed */
+void snode_tag_dirty(SpaceNode *snode)
+{
+	bNode *node;
+	
+	if(snode->treetype==NTREE_SHADER) {
+		if(snode->nodetree) {
+			for(node= snode->nodetree->nodes.first; node; node= node->next) {
+				if(node->type==SH_NODE_OUTPUT)
+					node->lasty= 0;
+			}
+			snode->flag |= SNODE_DO_PREVIEW;	/* this adds an afterqueue on a redraw, to allow button previews to work first */
+		}
+	}
+	// allqueue(REDRAWNODE, 1);
+}
+
+static void shader_node_previewrender(ScrArea *sa, SpaceNode *snode)
+{
+	bNode *node;
+	
+	if(snode->id==NULL) return;
+	if( ((Material *)snode->id )->use_nodes==0 ) return;
+
+	for(node= snode->nodetree->nodes.first; node; node= node->next) {
+		if(node->type==SH_NODE_OUTPUT) {
+			if(node->flag & NODE_DO_OUTPUT) {
+				if(node->lasty<PREVIEW_RENDERSIZE-2) {
+					RenderInfo ri;	
+//					int test= node->lasty;
+					
+					ri.curtile = 0;
+					ri.tottile = 0;
+					ri.rect = NULL;
+					ri.pr_rectx = PREVIEW_RENDERSIZE;
+					ri.pr_recty = PREVIEW_RENDERSIZE;
+					
+					// XXX BIF_previewrender(snode->id, &ri, NULL, PR_DO_RENDER);	/* sends redraw event */
+					if(ri.rect) MEM_freeN(ri.rect);
+					
+					/* when not finished... */
+					if(ri.curtile<ri.tottile)
+						; // XXX addafterqueue(sa->win, RENDERPREVIEW, 1);
+//					if(test!=node->lasty)
+//						printf("node rendered to %d\n", node->lasty);
+
+					break;
+				}
+			}
+		}
+	}
+}
+
+// XXX stub
+static void set_timecursor() {}
+static int blender_test_break() { return 0; }
+
+static void snode_handle_recalc(SpaceNode *snode)
+{
+	if(snode->treetype==NTREE_SHADER) {
+		// XXX BIF_preview_changed(ID_MA);	 /* signals buttons windows and node editors */
+	}
+	else if(snode->treetype==NTREE_COMPOSIT) {
+		if(G.scene->use_nodes) {
+			snode->nodetree->timecursor= set_timecursor;
+			G.afbreek= 0;
+			snode->nodetree->test_break= blender_test_break;
+			
+			// XXX BIF_store_spare();
+			
+			ntreeCompositExecTree(snode->nodetree, &G.scene->r, 1);	/* 1 is do_previews */
+			
+			snode->nodetree->timecursor= NULL;
+			snode->nodetree->test_break= NULL;
+			// XXX waitcursor(0);
+			
+			// allqueue(REDRAWIMAGE, 1);
+			if(G.scene->r.scemode & R_DOCOMP) {
+				// XXX BIF_redraw_render_rect();	/* seems to screwup display? */
+				// mywinset(curarea->win);
+			}
+		}
+
+		// allqueue(REDRAWNODE, 1);
+	}
+	else if(snode->treetype==NTREE_TEXTURE) {
+		ntreeTexUpdatePreviews(snode->nodetree);
+		// XXX BIF_preview_changed(ID_TE);
+	}
+}
+
+static void shader_node_event(SpaceNode *snode, short event)
+{
+	switch(event) {
+		case B_REDR:
+			// allqueue(REDRAWNODE, 1);
+			break;
+		default:
+			/* B_NODE_EXEC */
+			snode_handle_recalc(snode);
+			break;
+			
+	}
+}
+
+static int image_detect_file_sequence(int *start_p, int *frames_p, char *str)
+{
+	SpaceFile *sfile;
+	char name[FILE_MAX], head[FILE_MAX], tail[FILE_MAX], filename[FILE_MAX];
+	int a, frame, totframe, found, minframe;
+	unsigned short numlen;
+
+	sfile= scrarea_find_space_of_type(curarea, SPACE_FILE);
+	if(sfile==NULL || sfile->filelist==NULL)
+		return 0;
+
+	/* find first frame */
+	found= 0;
+	minframe= 0;
+
+	for(a=0; a<sfile->totfile; a++) {
+		if(sfile->filelist[a].flags & ACTIVE) {
+			BLI_strncpy(name, sfile->filelist[a].relname, sizeof(name));
+			frame= BLI_stringdec(name, head, tail, &numlen);
+
+			if(!found || frame < minframe) {
+				BLI_strncpy(filename, name, sizeof(name));
+				minframe= frame;
+				found= 1;
+			}
+		}
+	}
+
+	/* not one frame found */
+	if(!found)
+		return 0;
+
+	/* counter number of following frames */
+	found= 1;
+	totframe= 0;
+
+	for(frame=minframe; found; frame++) {
+		found= 0;
+		BLI_strncpy(name, filename, sizeof(name));
+		BLI_stringenc(name, head, tail, numlen, frame);
+
+		for(a=0; a<sfile->totfile; a++) {
+			if(sfile->filelist[a].flags & ACTIVE) {
+				if(strcmp(sfile->filelist[a].relname, name) == 0) {
+					found= 1;
+					totframe++;
+					break;
+				}
+			}
+		}
+	}
+
+	if(totframe > 1) {
+		BLI_strncpy(str, sfile->dir, sizeof(name));
+		strcat(str, filename);
+
+		*start_p= minframe;
+		*frames_p= totframe;
+		return 1;
+	}
+
+	return 0;
+}
+
+static void load_node_image(char *str)	/* called from fileselect */
+{
+	SpaceNode *snode= curarea->spacedata.first;
+	bNode *node= nodeGetActive(snode->edittree);
+	Image *ima= NULL;
+	ImageUser *iuser= node->storage;
+	char filename[FILE_MAX];
+	int start=0, frames=0, sequence;
+
+	sequence= image_detect_file_sequence(&start, &frames, filename);
+	if(sequence)
+		str= filename;
+	
+	ima= BKE_add_image_file(str);
+	if(ima) {
+		if(node->id)
+			node->id->us--;
+		
+		node->id= &ima->id;
+		id_us_plus(node->id);
+
+		BLI_strncpy(node->name, node->id->name+2, 21);
+
+		if(sequence) {
+			ima->source= IMA_SRC_SEQUENCE;
+			iuser->frames= frames;
+			iuser->offset= start-1;
+		}
+				   
+		BKE_image_signal(ima, node->storage, IMA_SIGNAL_RELOAD);
+		
+		NodeTagChanged(snode->edittree, node);
+		snode_handle_recalc(snode);
+		// allqueue(REDRAWNODE, 0); 
+	}
+}
+
+static void set_node_imagepath(char *str)	/* called from fileselect */
+{
+	SpaceNode *snode= curarea->spacedata.first;
+	bNode *node= nodeGetActive(snode->edittree);
+	BLI_strncpy(((NodeImageFile *)node->storage)->name, str, sizeof( ((NodeImageFile *)node->storage)->name ));
+}
+
+static bNode *snode_get_editgroup(SpaceNode *snode)
+{
+	bNode *gnode;
+	
+	/* get the groupnode */
+	for(gnode= snode->nodetree->nodes.first; gnode; gnode= gnode->next)
+		if(gnode->flag & NODE_GROUP_EDIT)
+			break;
+	return gnode;
+}
+
+/* node has to be of type 'render layers' */
+/* is a bit clumsy copying renderdata here... scene nodes use render size of current render */
+static void composite_node_render(SpaceNode *snode, bNode *node)
+{
+	RenderData rd;
+	Scene *scene= NULL;
+	int scemode, actlay;
+	
+	/* the button press won't show up otherwise, button hilites disabled */
+	force_draw(0);
+	
+	if(node->id && node->id!=(ID *)G.scene) {
+		scene= G.scene;
+		set_scene_bg((Scene *)node->id);
+		rd= G.scene->r;
+		G.scene->r.xsch= scene->r.xsch;
+		G.scene->r.ysch= scene->r.ysch;
+		G.scene->r.size= scene->r.size;
+		G.scene->r.mode &= ~(R_BORDER|R_DOCOMP);
+		G.scene->r.mode |= scene->r.mode & R_BORDER;
+		G.scene->r.border= scene->r.border;
+		G.scene->r.cfra= scene->r.cfra;
+	}
+	
+	scemode= G.scene->r.scemode;
+	actlay= G.scene->r.actlay;
+
+	G.scene->r.scemode |= R_SINGLE_LAYER|R_COMP_RERENDER;
+	G.scene->r.actlay= node->custom1;
+	
+	BIF_do_render(0);
+	
+	G.scene->r.scemode= scemode;
+	G.scene->r.actlay= actlay;
+
+	node->custom2= 0;
+	
+	if(scene) {
+		G.scene->r= rd;
+		set_scene_bg(scene);
+	}
+}
+
+static void composit_node_event(SpaceNode *snode, short event)
+{
+	
+	switch(event) {
+		case B_REDR:
+			// allqueue(REDRAWNODE, 1);
+			break;
+		case B_NODE_LOADIMAGE:
+		{
+			bNode *node= nodeGetActive(snode->edittree);
+			char name[FILE_MAXDIR+FILE_MAXFILE];
+			
+			if(node->id)
+				strcpy(name, ((Image *)node->id)->name);
+			else strcpy(name, U.textudir);
+			if (G.qual & LR_CTRLKEY) {
+				activate_imageselect(FILE_SPECIAL, "SELECT IMAGE", name, load_node_image);
+			} else {
+				activate_fileselect(FILE_SPECIAL, "SELECT IMAGE", name, load_node_image);
+			}
+			break;
+		}
+		case B_NODE_SETIMAGE:
+		{
+			bNode *node= nodeGetActive(snode->edittree);
+			char name[FILE_MAXDIR+FILE_MAXFILE];
+			
+			strcpy(name, ((NodeImageFile *)node->storage)->name);
+			if (G.qual & LR_CTRLKEY) {
+				activate_imageselect(FILE_SPECIAL, "SELECT OUTPUT DIR", name, set_node_imagepath);
+			} else {
+				activate_fileselect(FILE_SPECIAL, "SELECT OUTPUT DIR", name, set_node_imagepath);
+			}
+			break;
+		}
+		case B_NODE_TREE_EXEC:
+			snode_handle_recalc(snode);
+			break;		
+		default:
+			/* B_NODE_EXEC */
+		{
+			bNode *node= BLI_findlink(&snode->edittree->nodes, event-B_NODE_EXEC);
+			if(node) {
+				NodeTagChanged(snode->edittree, node);
+				/* don't use NodeTagIDChanged, it gives far too many recomposites for image, scene layers, ... */
+				
+				/* not the best implementation of the world... but we need it to work now :) */
+				if(node->type==CMP_NODE_R_LAYERS && node->custom2) {
+					/* add event for this window (after render curarea can be changed) */
+					addqueue(curarea->win, UI_BUT_EVENT, B_NODE_TREE_EXEC);
+					
+					composite_node_render(snode, node);
+					snode_handle_recalc(snode);
+					
+					/* add another event, a render can go fullscreen and open new window */
+					addqueue(curarea->win, UI_BUT_EVENT, B_NODE_TREE_EXEC);
+				}
+				else {
+					node= snode_get_editgroup(snode);
+					if(node)
+						NodeTagIDChanged(snode->nodetree, node->id);
+					
+					snode_handle_recalc(snode);
+				}
+			}
+		}			
+	}
+}
+
+static void texture_node_event(SpaceNode *snode, short event)
+{
+	switch(event) {
+		case B_REDR:
+			// allqueue(REDRAWNODE, 1);
+			break;
+		case B_NODE_LOADIMAGE:
+		{
+			bNode *node= nodeGetActive(snode->edittree);
+			char name[FILE_MAXDIR+FILE_MAXFILE];
+			
+			if(node->id)
+				strcpy(name, ((Image *)node->id)->name);
+			else strcpy(name, U.textudir);
+			if (G.qual & LR_CTRLKEY) {
+				activate_imageselect(FILE_SPECIAL, "SELECT IMAGE", name, load_node_image);
+			} else {
+				activate_fileselect(FILE_SPECIAL, "SELECT IMAGE", name, load_node_image);
+			}
+			break;
+		}
+		default:
+			/* B_NODE_EXEC */
+			ntreeTexCheckCyclics( snode->nodetree );
+			snode_handle_recalc(snode);
+			// allqueue(REDRAWNODE, 1);
+			break;
+	}
+}
+
+
+/* assumes nothing being done in ntree yet, sets the default in/out node */
+/* called from shading buttons or header */
+void node_shader_default(Material *ma)
+{
+	bNode *in, *out;
+	bNodeSocket *fromsock, *tosock;
+	
+	/* but lets check it anyway */
+	if(ma->nodetree) {
+		printf("error in shader initialize\n");
+		return;
+	}
+	
+	ma->nodetree= ntreeAddTree(NTREE_SHADER);
+	
+	out= nodeAddNodeType(ma->nodetree, SH_NODE_OUTPUT, NULL, NULL);
+	out->locx= 300.0f; out->locy= 300.0f;
+	
+	in= nodeAddNodeType(ma->nodetree, SH_NODE_MATERIAL, NULL, NULL);
+	in->locx= 10.0f; in->locy= 300.0f;
+	nodeSetActive(ma->nodetree, in);
+	
+	/* only a link from color to color */
+	fromsock= in->outputs.first;
+	tosock= out->inputs.first;
+	nodeAddLink(ma->nodetree, in, fromsock, out, tosock);
+	
+	ntreeSolveOrder(ma->nodetree);	/* needed for pointers */
+}
+
+/* assumes nothing being done in ntree yet, sets the default in/out node */
+/* called from shading buttons or header */
+void node_composit_default(Scene *sce)
+{
+	bNode *in, *out;
+	bNodeSocket *fromsock, *tosock;
+	
+	/* but lets check it anyway */
+	if(sce->nodetree) {
+		printf("error in composit initialize\n");
+		return;
+	}
+	
+	sce->nodetree= ntreeAddTree(NTREE_COMPOSIT);
+	
+	out= nodeAddNodeType(sce->nodetree, CMP_NODE_COMPOSITE, NULL, NULL);
+	out->locx= 300.0f; out->locy= 400.0f;
+	
+	in= nodeAddNodeType(sce->nodetree, CMP_NODE_R_LAYERS, NULL, NULL);
+	in->locx= 10.0f; in->locy= 400.0f;
+	nodeSetActive(sce->nodetree, in);
+	
+	/* links from color to color */
+	fromsock= in->outputs.first;
+	tosock= out->inputs.first;
+	nodeAddLink(sce->nodetree, in, fromsock, out, tosock);
+	
+	ntreeSolveOrder(sce->nodetree);	/* needed for pointers */
+	
+	ntreeCompositForceHidden(sce->nodetree);
+}
+
+/* assumes nothing being done in ntree yet, sets the default in/out node */
+/* called from shading buttons or header */
+void node_texture_default(Tex *tx)
+{
+	bNode *in, *out;
+	bNodeSocket *fromsock, *tosock;
+	
+	/* but lets check it anyway */
+	if(tx->nodetree) {
+		printf("error in texture initialize\n");
+		return;
+	}
+	
+	tx->nodetree= ntreeAddTree(NTREE_TEXTURE);
+	
+	out= nodeAddNodeType(tx->nodetree, TEX_NODE_OUTPUT, NULL, NULL);
+	out->locx= 300.0f; out->locy= 300.0f;
+	
+	in= nodeAddNodeType(tx->nodetree, TEX_NODE_CHECKER, NULL, NULL);
+	in->locx= 10.0f; in->locy= 300.0f;
+	nodeSetActive(tx->nodetree, in);
+	
+	fromsock= in->outputs.first;
+	tosock= out->inputs.first;
+	nodeAddLink(tx->nodetree, in, fromsock, out, tosock);
+	
+	ntreeSolveOrder(tx->nodetree);	/* needed for pointers */
+	ntreeTexUpdatePreviews(tx->nodetree);
+}
+#endif
+
+/* Here we set the active tree(s), even called for each redraw now, so keep it fast :) */
+void snode_set_context(SpaceNode *snode, Scene *scene)
+{
+	Object *ob= OBACT;
+	bNode *node= NULL;
+	
+	snode->nodetree= NULL;
+	snode->id= snode->from= NULL;
+	
+	if(snode->treetype==NTREE_SHADER) {
+		/* need active object, or we allow pinning... */
+		if(ob) {
+			Material *ma= give_current_material(ob, ob->actcol);
+			if(ma) {
+				snode->from= material_from(ob, ob->actcol);
+				snode->id= &ma->id;
+				snode->nodetree= ma->nodetree;
+			}
+		}
+	}
+	else if(snode->treetype==NTREE_COMPOSIT) {
+		snode->from= NULL;
+		snode->id= &G.scene->id;
+		
+		/* bit clumsy but reliable way to see if we draw first time */
+		if(snode->nodetree==NULL)
+			ntreeCompositForceHidden(G.scene->nodetree);
+		
+		snode->nodetree= G.scene->nodetree;
+	}
+	else if(snode->treetype==NTREE_TEXTURE) {
+		if(ob) {
+			Tex *tx= give_current_texture(ob, ob->actcol);
+			if(tx) {
+				snode->from= (ID*)ob; /* please check this; i have no idea what 'from' is. */
+				snode->id= &tx->id;
+				snode->nodetree= tx->nodetree;
+			}
+		}
+	}
+	
+	/* find editable group */
+	if(snode->nodetree)
+		for(node= snode->nodetree->nodes.first; node; node= node->next)
+			if(node->flag & NODE_GROUP_EDIT)
+				break;
+	
+	if(node && node->id)
+		snode->edittree= (bNodeTree *)node->id;
+	else
+		snode->edittree= snode->nodetree;
+}
+
+#if 0
+/* on activate image viewer, check if we show it */
+static void node_active_image(Image *ima)
+{
+	ScrArea *sa;
+	SpaceImage *sima= NULL;
+	
+	/* find an imagewindow showing render result */
+	for(sa=G.curscreen->areabase.first; sa; sa= sa->next) {
+		if(sa->spacetype==SPACE_IMAGE) {
+			sima= sa->spacedata.first;
+			if(sima->image && sima->image->source!=IMA_SRC_VIEWER)
+				break;
+		}
+	}
+	if(sa && sima) {
+		sima->image= ima;
+		scrarea_queue_winredraw(sa);
+		scrarea_queue_headredraw(sa);
+	}
+}
+
+
+static void node_set_active(SpaceNode *snode, bNode *node)
+{
+	
+	nodeSetActive(snode->edittree, node);
+	
+	if(node->type!=NODE_GROUP) {
+		
+		/* tree specific activate calls */
+		if(snode->treetype==NTREE_SHADER) {
+			
+			/* when we select a material, active texture is cleared, for buttons */
+			if(node->id && GS(node->id->name)==ID_MA)
+				nodeClearActiveID(snode->edittree, ID_TE);
+			if(node->id)
+				; // XXX BIF_preview_changed(-1);	/* temp hack to force texture preview to update */
+			
+			// allqueue(REDRAWBUTSSHADING, 1);
+			// allqueue(REDRAWIPO, 0);
+		}
+		else if(snode->treetype==NTREE_COMPOSIT) {
+			/* make active viewer, currently only 1 supported... */
+			if( ELEM(node->type, CMP_NODE_VIEWER, CMP_NODE_SPLITVIEWER)) {
+				bNode *tnode;
+				int was_output= node->flag & NODE_DO_OUTPUT;
+
+				for(tnode= snode->edittree->nodes.first; tnode; tnode= tnode->next)
+					if( ELEM(tnode->type, CMP_NODE_VIEWER, CMP_NODE_SPLITVIEWER))
+						tnode->flag &= ~NODE_DO_OUTPUT;
+				
+				node->flag |= NODE_DO_OUTPUT;
+				if(was_output==0) {
+					bNode *gnode;
+					
+					NodeTagChanged(snode->edittree, node);
+					
+					/* if inside group, tag entire group */
+					gnode= snode_get_editgroup(snode);
+					if(gnode)
+						NodeTagIDChanged(snode->nodetree, gnode->id);
+					
+					snode_handle_recalc(snode);
+				}
+				
+				/* addnode() doesnt link this yet... */
+				node->id= (ID *)BKE_image_verify_viewer(IMA_TYPE_COMPOSITE, "Viewer Node");
+			}
+			else if(node->type==CMP_NODE_IMAGE) {
+				if(node->id)
+					node_active_image((Image *)node->id);
+			}
+			else if(node->type==CMP_NODE_R_LAYERS) {
+				if(node->id==NULL || node->id==(ID *)G.scene) {
+					G.scene->r.actlay= node->custom1;
+					// allqueue(REDRAWBUTSSCENE, 0);
+				}
+			}
+		}
+		else if(snode->treetype==NTREE_TEXTURE) {
+			if(node->id)
+				; // XXX BIF_preview_changed(-1);
+			// allqueue(REDRAWBUTSSHADING, 1);
+			// allqueue(REDRAWIPO, 0);
+		}
+	}
+}
+
+void snode_make_group_editable(SpaceNode *snode, bNode *gnode)
+{
+	bNode *node;
+	
+	/* make sure nothing has group editing on */
+	for(node= snode->nodetree->nodes.first; node; node= node->next)
+		node->flag &= ~NODE_GROUP_EDIT;
+	
+	if(gnode==NULL) {
+		/* with NULL argument we do a toggle */
+		if(snode->edittree==snode->nodetree)
+			gnode= nodeGetActive(snode->nodetree);
+	}
+	
+	if(gnode && gnode->type==NODE_GROUP && gnode->id) {
+		if(gnode->id->lib) {
+			if(okee("Make Group Local"))
+				ntreeMakeLocal((bNodeTree *)gnode->id);
+			else
+				return;
+		}
+		gnode->flag |= NODE_GROUP_EDIT;
+		snode->edittree= (bNodeTree *)gnode->id;
+		
+		/* deselect all other nodes, so we can also do grabbing of entire subtree */
+		for(node= snode->nodetree->nodes.first; node; node= node->next)
+			node->flag &= ~SELECT;
+		gnode->flag |= SELECT;
+		
+	}
+	else 
+		snode->edittree= snode->nodetree;
+	
+	ntreeSolveOrder(snode->nodetree);
+	
+	/* finally send out events for new active node */
+	if(snode->treetype==NTREE_SHADER) {
+		// allqueue(REDRAWBUTSSHADING, 0);
+		
+		// XXX BIF_preview_changed(-1);	/* temp hack to force texture preview to update */
+	}
+	
+	// allqueue(REDRAWNODE, 0);
+}
+
+void node_ungroup(SpaceNode *snode)
+{
+	bNode *gnode;
+
+	/* are we inside of a group? */
+	gnode= snode_get_editgroup(snode);
+	if(gnode)
+		snode_make_group_editable(snode, NULL);
+	
+	gnode= nodeGetActive(snode->edittree);
+	if(gnode==NULL) return;
+	
+	if(gnode->type!=NODE_GROUP)
+		error("Not a group");
+	else {
+		if(nodeGroupUnGroup(snode->edittree, gnode)) {
+			
+			BIF_undo_push("Deselect all nodes");
+			// allqueue(REDRAWNODE, 0);
+		}
+		else
+			error("Can't ungroup");
+	}
+}
+
+/* when links in groups change, inputs/outputs change, nodes added/deleted... */
+static void snode_verify_groups(SpaceNode *snode)
+{
+	bNode *gnode;
+	
+	gnode= snode_get_editgroup(snode);
+	
+	/* does all materials */
+	if(gnode)
+		nodeVerifyGroup((bNodeTree *)gnode->id);
+	
+}
+
+static void node_addgroup(SpaceNode *snode)
+{
+	bNodeTree *ngroup;
+	int tot= 0, offs, val;
+	char *strp;
+	
+	if(snode->edittree!=snode->nodetree) {
+		error("Can not add a Group in a Group");
+		return;
+	}
+	
+	/* construct menu with choices */
+	for(ngroup= G.main->nodetree.first; ngroup; ngroup= ngroup->id.next) {
+		if(ngroup->type==snode->treetype)
+			tot++;
+	}
+	if(tot==0) {
+		error("No groups available in database");
+		return;
+	}
+	strp= MEM_mallocN(32*tot+32, "menu");
+	strcpy(strp, "Add Group %t");
+	offs= strlen(strp);
+	
+	for(tot=0, ngroup= G.main->nodetree.first; ngroup; ngroup= ngroup->id.next, tot++) {
+		if(ngroup->type==snode->treetype)
+			offs+= sprintf(strp+offs, "|%s %%x%d", ngroup->id.name+2, tot);
+	}	
+	
+	val= pupmenu(strp);
+	if(val>=0) {
+		ngroup= BLI_findlink(&G.main->nodetree, val);
+		if(ngroup) {
+			bNode *node= nodeAddNodeType(snode->edittree, NODE_GROUP, ngroup, NULL);
+			
+			/* generics */
+			if(node) {
+				float locx, locy;
+				short mval[2];
+
+				node_deselectall(snode, 0);
+				
+				getmouseco_areawin(mval);
+				areamouseco_to_ipoco(G.v2d, mval, &locx, &locy);
+				
+				node->locx= locx;
+				node->locy= locy + 60.0f;		// arbitrary.. so its visible
+				node->flag |= SELECT;
+				
+				id_us_plus(node->id);
+				
+				node_set_active(snode, node);
+				BIF_undo_push("Add Node");
+			}
+		}			
+	}
+	MEM_freeN(strp);
+}
+
+
+/* ************************** Node generic ************** */
+
+/* allows to walk the list in order of visibility */
+static bNode *next_node(bNodeTree *ntree)
+{
+	static bNode *current=NULL, *last= NULL;
+	
+	if(ntree) {
+		/* set current to the first selected node */
+		for(current= ntree->nodes.last; current; current= current->prev)
+			if(current->flag & NODE_SELECT)
+				break;
+		
+		/* set last to the first unselected node */
+		for(last= ntree->nodes.last; last; last= last->prev)
+			if((last->flag & NODE_SELECT)==0)
+				break;
+		
+		if(current==NULL)
+			current= last;
+		
+		return NULL;
+	}
+	/* no nodes, or we are ready */
+	if(current==NULL)
+		return NULL;
+	
+	/* now we walk the list backwards, but we always return current */
+	if(current->flag & NODE_SELECT) {
+		bNode *node= current;
+		
+		/* find previous selected */
+		current= current->prev;
+		while(current && (current->flag & NODE_SELECT)==0)
+			current= current->prev;
+		
+		/* find first unselected */
+		if(current==NULL)
+			current= last;
+		
+		return node;
+	}
+	else {
+		bNode *node= current;
+		
+		/* find previous unselected */
+		current= current->prev;
+		while(current && (current->flag & NODE_SELECT))
+			current= current->prev;
+		
+		return node;
+	}
+	
+	return NULL;
+}
+
+/* is rct in visible part of node? */
+static bNode *visible_node(SpaceNode *snode, rctf *rct)
+{
+	bNode *tnode;
+	
+	for(next_node(snode->edittree); (tnode=next_node(NULL));) {
+		if(BLI_isect_rctf(&tnode->totr, rct, NULL))
+			break;
+	}
+	return tnode;
+}
+
+void snode_home(ScrArea *sa, SpaceNode *snode)
+{
+	bNode *node;
+	int first= 1;
+	
+	snode->v2d.cur.xmin= snode->v2d.cur.ymin= 0.0f;
+	snode->v2d.cur.xmax= sa->winx;
+	snode->v2d.cur.xmax= sa->winy;
+	
+	if(snode->edittree) {
+		for(node= snode->edittree->nodes.first; node; node= node->next) {
+			if(first) {
+				first= 0;
+				snode->v2d.cur= node->totr;
+			}
+			else {
+				BLI_union_rctf(&snode->v2d.cur, &node->totr);
+			}
+		}
+	}
+	snode->v2d.tot= snode->v2d.cur;
+	
+	snode->xof = snode->yof = 0.0;
+	
+	test_view2d(G.v2d, sa->winx, sa->winy);
+	
+}
+
+void snode_zoom_out(ScrArea *sa)
+{
+	float dx;
+	
+	dx= (float)(0.15*(G.v2d->cur.xmax-G.v2d->cur.xmin));
+	G.v2d->cur.xmin-= dx;
+	G.v2d->cur.xmax+= dx;
+	dx= (float)(0.15*(G.v2d->cur.ymax-G.v2d->cur.ymin));
+	G.v2d->cur.ymin-= dx;
+	G.v2d->cur.ymax+= dx;
+	test_view2d(G.v2d, sa->winx, sa->winy);
+}
+
+void snode_zoom_in(ScrArea *sa)
+{
+	float dx;
+	
+	dx= (float)(0.1154*(G.v2d->cur.xmax-G.v2d->cur.xmin));
+	G.v2d->cur.xmin+= dx;
+	G.v2d->cur.xmax-= dx;
+	dx= (float)(0.1154*(G.v2d->cur.ymax-G.v2d->cur.ymin));
+	G.v2d->cur.ymin+= dx;
+	G.v2d->cur.ymax-= dx;
+	test_view2d(G.v2d, sa->winx, sa->winy);
+}
+
+static void snode_bg_viewmove(SpaceNode *snode)
+{
+	ScrArea *sa;
+	Image *ima;
+	ImBuf *ibuf;
+	Window *win;
+	short mval[2], mvalo[2];
+	short rectx, recty, xmin, xmax, ymin, ymax, pad;
+	int oldcursor;
+	
+	ima= BKE_image_verify_viewer(IMA_TYPE_COMPOSITE, "Viewer Node");
+	ibuf= BKE_image_get_ibuf(ima, NULL);
+	
+	sa = snode->area;
+	
+	if(ibuf) {
+		rectx = ibuf->x;
+		recty = ibuf->y;
+	} else {
+		rectx = recty = 1;
+	}
+	
+	pad = 10;
+	xmin = -(sa->winx/2) - rectx/2 + pad;
+	xmax = sa->winx/2 + rectx/2 - pad;
+	ymin = -(sa->winy/2) - recty/2 + pad;
+	ymax = sa->winy/2 + recty/2 - pad;
+	
+	getmouseco_sc(mvalo);
+	
+	/* store the old cursor to temporarily change it */
+	oldcursor=get_cursor();
+	win=winlay_get_active_window();
+	
+	SetBlenderCursor(BC_NSEW_SCROLLCURSOR);
+	
+	while(get_mbut()&(L_MOUSE|M_MOUSE)) {
+		
+		getmouseco_sc(mval);
+		
+		if(mvalo[0]!=mval[0] || mvalo[1]!=mval[1]) {
+			
+			snode->xof -= (mvalo[0]-mval[0]);
+			snode->yof -= (mvalo[1]-mval[1]);
+			
+			/* prevent dragging image outside of the window and losing it! */
+			CLAMP(snode->xof, xmin, xmax);
+			CLAMP(snode->yof, ymin, ymax);
+			
+			mvalo[0]= mval[0];
+			mvalo[1]= mval[1];
+			
+			scrarea_do_windraw(curarea);
+			screen_swapbuffers();
+		}
+		else BIF_wait_for_statechange();
+	}
+	
+	window_set_cursor(win, oldcursor);
+}
+
+static void reset_sel_socket(SpaceNode *snode, int in_out)
+{
+	bNode *node;
+	bNodeSocket *sock;
+	
+	for(node= snode->edittree->nodes.first; node; node= node->next) {
+		if(in_out & SOCK_IN) {
+			for(sock= node->inputs.first; sock; sock= sock->next)
+				if(sock->flag & SOCK_SEL) sock->flag&= ~SOCK_SEL;
+		}
+		if(in_out & SOCK_OUT) {
+			for(sock= node->outputs.first; sock; sock= sock->next)
+				if(sock->flag & SOCK_SEL) sock->flag&= ~SOCK_SEL;
+		}
+	}
+}
+
+/* checks mouse position, and returns found node/socket */
+/* type is SOCK_IN and/or SOCK_OUT */
+static int find_indicated_socket(SpaceNode *snode, bNode **nodep, bNodeSocket **sockp, int in_out)
+{
+	bNode *node;
+	bNodeSocket *sock;
+	rctf rect;
+	short mval[2];
+	
+	getmouseco_areawin(mval);
+	
+	/* check if we click in a socket */
+	for(node= snode->edittree->nodes.first; node; node= node->next) {
+	
+		areamouseco_to_ipoco(G.v2d, mval, &rect.xmin, &rect.ymin);
+		
+		rect.xmin -= NODE_SOCKSIZE+3;
+		rect.ymin -= NODE_SOCKSIZE+3;
+		rect.xmax = rect.xmin + 2*NODE_SOCKSIZE+6;
+		rect.ymax = rect.ymin + 2*NODE_SOCKSIZE+6;
+		
+		if (!(node->flag & NODE_HIDDEN)) {
+			/* extra padding inside and out - allow dragging on the text areas too */
+			if (in_out == SOCK_IN) {
+				rect.xmax += NODE_SOCKSIZE;
+				rect.xmin -= NODE_SOCKSIZE*4;
+			} else if (in_out == SOCK_OUT) {
+				rect.xmax += NODE_SOCKSIZE*4;
+				rect.xmin -= NODE_SOCKSIZE;
+			}
+		}
+			
+		if(in_out & SOCK_IN) {
+			for(sock= node->inputs.first; sock; sock= sock->next) {
+				if(!(sock->flag & (SOCK_HIDDEN|SOCK_UNAVAIL))) {
+					if(BLI_in_rctf(&rect, sock->locx, sock->locy)) {
+						if(node == visible_node(snode, &rect)) {
+							*nodep= node;
+							*sockp= sock;
+							return 1;
+						}
+					}
+				}
+			}
+		}
+		if(in_out & SOCK_OUT) {
+			for(sock= node->outputs.first; sock; sock= sock->next) {
+				if(!(sock->flag & (SOCK_HIDDEN|SOCK_UNAVAIL))) {
+					if(BLI_in_rctf(&rect, sock->locx, sock->locy)) {
+						if(node == visible_node(snode, &rect)) {
+							*nodep= node;
+							*sockp= sock;
+							return 1;
+						}
+					}
+				}
+			}
+		}
+	}
+	return 0;
+}
+
+/* ********************* transform ****************** */
+
+/* releases on event, only intern (for extern see below) */
+/* we need argument ntree to allow operations on edittree or nodetree */
+static void transform_nodes(bNodeTree *ntree, char mode, char *undostr)
+{
+	bNode *node;
+	float mxstart, mystart, mx, my, *oldlocs, *ol;
+	int cont=1, tot=0, cancel=0, firsttime=1;
+	short mval[2], mvalo[2];
+	
+	/* count total */
+	for(node= ntree->nodes.first; node; node= node->next)
+		if(node->flag & SELECT) tot++;
+	
+	if(tot==0) return;
+	
+	/* store oldlocs */
+	ol= oldlocs= MEM_mallocN(sizeof(float)*2*tot, "oldlocs transform");
+	for(node= ntree->nodes.first; node; node= node->next) {
+		if(node->flag & SELECT) {
+			ol[0]= node->locx; ol[1]= node->locy;
+			ol+= 2;
+		}
+	}
+	
+	getmouseco_areawin(mvalo);
+	areamouseco_to_ipoco(G.v2d, mvalo, &mxstart, &mystart);
+	
+	while(cont) {
+		
+		getmouseco_areawin(mval);
+		if(mval[0]!=mvalo[0] || mval[1]!=mvalo[1] || firsttime) {
+
+			firsttime= 0;
+			
+			areamouseco_to_ipoco(G.v2d, mval, &mx, &my);
+			mvalo[0]= mval[0];
+			mvalo[1]= mval[1];
+			
+			for(ol= oldlocs, node= ntree->nodes.first; node; node= node->next) {
+				if(node->flag & SELECT) {
+					node->locx= ol[0] + mx-mxstart;
+					node->locy= ol[1] + my-mystart;
+					ol+= 2;
+				}
+			}
+			
+			force_draw(0);
+		}
+		else
+			PIL_sleep_ms(10);
+		
+		while (qtest()) {
+			short val;
+			unsigned short event= extern_qread(&val);
+			
+			switch (event) {
+				case LEFTMOUSE:
+				case SPACEKEY:
+				case RETKEY:
+					cont=0;
+					break;
+				case ESCKEY:
+				case RIGHTMOUSE:
+					if(val) {
+						cancel=1;
+						cont=0;
+					}
+					break;
+				default:
+					if(val) arrows_move_cursor(event);
+					break;
+			}
+		}
+		
+	}
+	
+	if(cancel) {
+		for(ol= oldlocs, node= ntree->nodes.first; node; node= node->next) {
+			if(node->flag & SELECT) {
+				node->locx= ol[0];
+				node->locy= ol[1];
+				ol+= 2;
+			}
+		}
+		
+	}
+	else
+		BIF_undo_push(undostr);
+	
+	// allqueue(REDRAWNODE, 1);
+	MEM_freeN(oldlocs);
+}
+
+/* external call, also for callback */
+void node_transform_ext(int mode, int unused)
+{
+	SpaceNode *snode= curarea->spacedata.first;
+	
+	transform_nodes(snode->edittree, 'g', "Move Node");
+}
+
+
+/* releases on event, only 1 node */
+static void scale_node(SpaceNode *snode, bNode *node)
+{
+	float mxstart, mystart, mx, my, oldwidth;
+	int cont=1, cancel=0;
+	short mval[2], mvalo[2];
+	
+	/* store old */
+	if(node->flag & NODE_HIDDEN)
+		oldwidth= node->miniwidth;
+	else
+		oldwidth= node->width;
+		
+	getmouseco_areawin(mvalo);
+	areamouseco_to_ipoco(G.v2d, mvalo, &mxstart, &mystart);
+	
+	while(cont) {
+		
+		getmouseco_areawin(mval);
+		if(mval[0]!=mvalo[0] || mval[1]!=mvalo[1]) {
+			
+			areamouseco_to_ipoco(G.v2d, mval, &mx, &my);
+			mvalo[0]= mval[0];
+			mvalo[1]= mval[1];
+			
+			if(node->flag & NODE_HIDDEN) {
+				node->miniwidth= oldwidth + mx-mxstart;
+				CLAMP(node->miniwidth, 0.0f, 100.0f);
+			}
+			else {
+				node->width= oldwidth + mx-mxstart;
+				CLAMP(node->width, node->typeinfo->minwidth, node->typeinfo->maxwidth);
+			}
+			
+			force_draw(0);
+		}
+		else
+			PIL_sleep_ms(10);
+		
+		while (qtest()) {
+			short val;
+			unsigned short event= extern_qread(&val);
+			
+			switch (event) {
+				case LEFTMOUSE:
+				case SPACEKEY:
+				case RETKEY:
+					cont=0;
+					break;
+				case ESCKEY:
+				case RIGHTMOUSE:
+					if(val) {
+						cancel=1;
+						cont=0;
+					}
+					break;
+			}
+		}
+		
+	}
+	
+	if(cancel) {
+		node->width= oldwidth;
+	}
+	else
+		BIF_undo_push("Scale Node");
+	
+	// allqueue(REDRAWNODE, 1);
+	
+	if(snode->nodetree->type == NTREE_TEXTURE)
+		ntreeTexUpdatePreviews(snode->nodetree);
+}
+
+/* ******************** rename ******************* */
+
+void node_rename(SpaceNode *snode)
+{
+	bNode *node, *rename_node;
+	short found_node= 0;
+
+	/* check if a node is selected */
+	for(node= snode->edittree->nodes.first; node; node= node->next) {
+		if(node->flag & SELECT) {
+			found_node= 1;
+			break;
+		}
+	}
+
+	if(found_node) {
+		rename_node= nodeGetActive(snode->edittree);
+		node_rename_but((char *)rename_node->username);
+		BIF_undo_push("Rename Node");
+	
+		// allqueue(REDRAWNODE, 1);
+	}
+}
+
+/* ********************** select ******************** */
+
+/* used in buttons to check context, also checks for edited groups */
+bNode *editnode_get_active_idnode(bNodeTree *ntree, short id_code)
+{
+	return nodeGetActiveID(ntree, id_code);
+}
+
+/* used in buttons to check context, also checks for edited groups */
+Material *editnode_get_active_material(Material *ma)
+{
+	if(ma && ma->use_nodes && ma->nodetree) {
+		bNode *node= editnode_get_active_idnode(ma->nodetree, ID_MA);
+		if(node)
+			return (Material *)node->id;
+		else
+			return NULL;
+	}
+	return ma;
+}
+
+/* used in buttons to check context, also checks for edited groups */
+bNode *editnode_get_active(bNodeTree *ntree)
+{
+	bNode *node;
+	
+	/* check for edited group */
+	for(node= ntree->nodes.first; node; node= node->next)
+		if(node->flag & NODE_GROUP_EDIT)
+			break;
+	if(node)
+		return nodeGetActive((bNodeTree *)node->id);
+	else
+		return nodeGetActive(ntree);
+}
+
+
+/* no undo here! */
+void node_deselectall(SpaceNode *snode, int swap)
+{
+	bNode *node;
+	
+	if(swap) {
+		for(node= snode->edittree->nodes.first; node; node= node->next)
+			if(node->flag & SELECT)
+				break;
+		if(node==NULL) {
+			for(node= snode->edittree->nodes.first; node; node= node->next)
+				node->flag |= SELECT;
+			// allqueue(REDRAWNODE, 0);
+			return;
+		}
+		/* else pass on to deselect */
+	}
+	
+	for(node= snode->edittree->nodes.first; node; node= node->next)
+		node->flag &= ~SELECT;
+	
+	// allqueue(REDRAWNODE, 0);
+}
+
+int node_has_hidden_sockets(bNode *node)
+{
+	bNodeSocket *sock;
+	
+	for(sock= node->inputs.first; sock; sock= sock->next)
+		if(sock->flag & SOCK_HIDDEN)
+			return 1;
+	for(sock= node->outputs.first; sock; sock= sock->next)
+		if(sock->flag & SOCK_HIDDEN)
+			return 1;
+	return 0;
+}
+
+
+static void node_hide_unhide_sockets(SpaceNode *snode, bNode *node)
+{
+	bNodeSocket *sock;
+	
+	/* unhide all */
+	if( node_has_hidden_sockets(node) ) {
+		for(sock= node->inputs.first; sock; sock= sock->next)
+			sock->flag &= ~SOCK_HIDDEN;
+		for(sock= node->outputs.first; sock; sock= sock->next)
+			sock->flag &= ~SOCK_HIDDEN;
+	}
+	else {
+		bNode *gnode= snode_get_editgroup(snode);
+		
+		/* hiding inside group should not break links in other group users */
+		if(gnode) {
+			nodeGroupSocketUseFlags((bNodeTree *)gnode->id);
+			for(sock= node->inputs.first; sock; sock= sock->next)
+				if(!(sock->flag & SOCK_IN_USE))
+					if(sock->link==NULL)
+						sock->flag |= SOCK_HIDDEN;
+			for(sock= node->outputs.first; sock; sock= sock->next)
+				if(!(sock->flag & SOCK_IN_USE))
+					if(nodeCountSocketLinks(snode->edittree, sock)==0)
+						sock->flag |= SOCK_HIDDEN;
+		}
+		else {
+			/* hide unused sockets */
+			for(sock= node->inputs.first; sock; sock= sock->next) {
+				if(sock->link==NULL)
+					sock->flag |= SOCK_HIDDEN;
+			}
+			for(sock= node->outputs.first; sock; sock= sock->next) {
+				if(nodeCountSocketLinks(snode->edittree, sock)==0)
+					sock->flag |= SOCK_HIDDEN;
+			}
+		}
+	}
+
+	// allqueue(REDRAWNODE, 1);
+	snode_verify_groups(snode);
+	BIF_undo_push("Hide/Unhide sockets");
+
+}
+
+static int do_header_node(SpaceNode *snode, bNode *node, float mx, float my)
+{
+	rctf totr= node->totr;
+	
+	totr.ymin= totr.ymax-20.0f;
+	
+	totr.xmax= totr.xmin+15.0f;
+	if(BLI_in_rctf(&totr, mx, my)) {
+		node->flag |= NODE_HIDDEN;
+		// allqueue(REDRAWNODE, 0);
+		return 1;
+	}	
+	
+	totr.xmax= node->totr.xmax;
+	totr.xmin= totr.xmax-18.0f;
+	if(node->typeinfo->flag & NODE_PREVIEW) {
+		if(BLI_in_rctf(&totr, mx, my)) {
+			node->flag ^= NODE_PREVIEW;
+			// allqueue(REDRAWNODE, 0);
+			return 1;
+		}
+		totr.xmin-=18.0f;
+	}
+	if(node->type == NODE_GROUP) {
+		if(BLI_in_rctf(&totr, mx, my)) {
+			snode_make_group_editable(snode, node);
+			return 1;
+		}
+		totr.xmin-=18.0f;
+	}
+	if(node->typeinfo->flag & NODE_OPTIONS) {
+		if(BLI_in_rctf(&totr, mx, my)) {
+			node->flag ^= NODE_OPTIONS;
+			// allqueue(REDRAWNODE, 0);
+			return 1;
+		}
+		totr.xmin-=18.0f;
+	}
+	/* hide unused sockets */
+	if(BLI_in_rctf(&totr, mx, my)) {
+		node_hide_unhide_sockets(snode, node);
+	}
+	
+	
+	totr= node->totr;
+	totr.xmin= totr.xmax-10.0f;
+	totr.ymax= totr.ymin+10.0f;
+	if(BLI_in_rctf(&totr, mx, my)) {
+		scale_node(snode, node);
+		return 1;
+	}
+	return 0;
+}
+
+static int do_header_hidden_node(SpaceNode *snode, bNode *node, float mx, float my)
+{
+	rctf totr= node->totr;
+	
+	totr.xmax= totr.xmin+15.0f;
+	if(BLI_in_rctf(&totr, mx, my)) {
+		node->flag &= ~NODE_HIDDEN;
+		// allqueue(REDRAWNODE, 0);
+		return 1;
+	}	
+	
+	totr.xmax= node->totr.xmax;
+	totr.xmin= node->totr.xmax-15.0f;
+	if(BLI_in_rctf(&totr, mx, my)) {
+		scale_node(snode, node);
+		return 1;
+	}
+	return 0;
+}
+
+static void node_link_viewer(SpaceNode *snode, bNode *tonode)
+{
+	bNode *node;
+
+	/* context check */
+	if(tonode==NULL || tonode->outputs.first==NULL)
+		return;
+	if( ELEM(tonode->type, CMP_NODE_VIEWER, CMP_NODE_SPLITVIEWER)) 
+		return;
+	
+	/* get viewer */
+	for(node= snode->edittree->nodes.first; node; node= node->next)
+		if( ELEM(node->type, CMP_NODE_VIEWER, CMP_NODE_SPLITVIEWER)) 
+			if(node->flag & NODE_DO_OUTPUT)
+				break;
+		
+	if(node) {
+		bNodeLink *link;
+		
+		/* get link to viewer */
+		for(link= snode->edittree->links.first; link; link= link->next)
+			if(link->tonode==node)
+				break;
+
+		if(link) {
+			link->fromnode= tonode;
+			link->fromsock= tonode->outputs.first;
+			NodeTagChanged(snode->edittree, node);
+			
+			snode_handle_recalc(snode);
+		}
+	}
+}
+
+
+void node_active_link_viewer(SpaceNode *snode)
+{
+	bNode *node= editnode_get_active(snode->edittree);
+	if(node)
+		node_link_viewer(snode, node);
+}
+
+/* return 0: nothing done */
+static int node_mouse_select(SpaceNode *snode, unsigned short event)
+{
+	bNode *node;
+	float mx, my;
+	short mval[2];
+	
+	getmouseco_areawin(mval);
+	areamouseco_to_ipoco(G.v2d, mval, &mx, &my);
+	
+	for(next_node(snode->edittree); (node=next_node(NULL));) {
+		
+		/* first check for the headers or scaling widget */
+		if(node->flag & NODE_HIDDEN) {
+			if(do_header_hidden_node(snode, node, mx, my))
+				return 1;
+		}
+		else {
+			if(do_header_node(snode, node, mx, my))
+				return 1;
+		}
+		
+		/* node body */
+		if(BLI_in_rctf(&node->totr, mx, my))
+			break;
+	}
+	if(node) {
+		if((G.qual & LR_SHIFTKEY)==0)
+			node_deselectall(snode, 0);
+		
+		if(G.qual & LR_SHIFTKEY) {
+			if(node->flag & SELECT)
+				node->flag &= ~SELECT;
+			else
+				node->flag |= SELECT;
+		}
+		else 
+			node->flag |= SELECT;
+		
+		node_set_active(snode, node);
+		
+		/* viewer linking */
+		if(G.qual & LR_CTRLKEY)
+			node_link_viewer(snode, node);
+		
+		/* not so nice (no event), but function below delays redraw otherwise */
+		force_draw(0);
+		
+		std_rmouse_transform(node_transform_ext);	/* does undo push for select */
+		
+		return 1;
+	}
+	return 0;
+}
+
+/* return 0, nothing done */
+static int node_mouse_groupheader(SpaceNode *snode)
+{
+	bNode *gnode;
+	float mx, my;
+	short mval[2];
+	
+	gnode= snode_get_editgroup(snode);
+	if(gnode==NULL) return 0;
+	
+	getmouseco_areawin(mval);
+	areamouseco_to_ipoco(G.v2d, mval, &mx, &my);
+	
+	/* click in header or outside? */
+	if(BLI_in_rctf(&gnode->totr, mx, my)==0) {
+		rctf rect= gnode->totr;
+		
+		rect.ymax += NODE_DY;
+		if(BLI_in_rctf(&rect, mx, my)==0)
+			snode_make_group_editable(snode, NULL);	/* toggles, so exits editmode */
+		else
+			transform_nodes(snode->nodetree, 'g', "Move group");
+		
+		return 1;
+	}
+	return 0;
+}
+
+static int node_socket_hilights(SpaceNode *snode, int in_out)
+{
+	bNode *node;
+	bNodeSocket *sock, *tsock, *socksel= NULL;
+	float mx, my;
+	short mval[2], redraw= 0;
+	
+	if(snode->edittree==NULL) return 0;
+	
+	getmouseco_areawin(mval);
+	areamouseco_to_ipoco(G.v2d, mval, &mx, &my);
+	
+	/* deselect socks */
+	for(node= snode->edittree->nodes.first; node; node= node->next) {
+		for(sock= node->inputs.first; sock; sock= sock->next) {
+			if(sock->flag & SELECT) {
+				sock->flag &= ~SELECT;
+				redraw++;
+				socksel= sock;
+			}
+		}
+		for(sock= node->outputs.first; sock; sock= sock->next) {
+			if(sock->flag & SELECT) {
+				sock->flag &= ~SELECT;
+				redraw++;
+				socksel= sock;
+			}
+		}
+	}
+	
+	if(find_indicated_socket(snode, &node, &tsock, in_out)) {
+		tsock->flag |= SELECT;
+		if(redraw==1 && tsock==socksel) redraw= 0;
+		else redraw= 1;
+	}
+	
+	return redraw;
+}
+
+void node_border_select(SpaceNode *snode)
+{
+	bNode *node;
+	rcti rect;
+	rctf rectf;
+	short val, mval[2];
+	
+	if ( (val = get_border(&rect, 3)) ) {
+		
+		mval[0]= rect.xmin;
+		mval[1]= rect.ymin;
+		areamouseco_to_ipoco(G.v2d, mval, &rectf.xmin, &rectf.ymin);
+		mval[0]= rect.xmax;
+		mval[1]= rect.ymax;
+		areamouseco_to_ipoco(G.v2d, mval, &rectf.xmax, &rectf.ymax);
+		
+		for(node= snode->edittree->nodes.first; node; node= node->next) {
+			if(BLI_isect_rctf(&rectf, &node->totr, NULL)) {
+				if(val==LEFTMOUSE)
+					node->flag |= SELECT;
+				else
+					node->flag &= ~SELECT;
+			}
+		}
+		// allqueue(REDRAWNODE, 1);
+		BIF_undo_push("Border select nodes");
+	}		
+}
+
+/* ****************** Add *********************** */
+
+void snode_autoconnect(SpaceNode *snode, bNode *node_to, int flag)
+{
+	bNodeSocket *sock, *sockfrom[8];
+	bNode *node, *nodefrom[8];
+	int totsock= 0, socktype=0;
+
+	if(node_to==NULL || node_to->inputs.first==NULL)
+		return;
+	
+	/* no inputs for node allowed (code it) */
+
+	/* connect first 1 socket type now */
+	for(sock= node_to->inputs.first; sock; sock= sock->next)
+		if(socktype<sock->type)
+			socktype= sock->type;
+
+	
+	/* find potential sockets, max 8 should work */
+	for(node= snode->edittree->nodes.first; node; node= node->next) {
+		if((node->flag & flag) && node!=node_to) {
+			for(sock= node->outputs.first; sock; sock= sock->next) {
+				if(!(sock->flag & (SOCK_HIDDEN|SOCK_UNAVAIL))) {
+					sockfrom[totsock]= sock;
+					nodefrom[totsock]= node;
+					totsock++;
+					if(totsock>7)
+						break;
+				}
+			}
+		}
+		if(totsock>7)
+			break;
+	}
+
+	/* now just get matching socket types and create links */
+	for(sock= node_to->inputs.first; sock; sock= sock->next) {
+		int a;
+		
+		for(a=0; a<totsock; a++) {
+			if(sockfrom[a]) {
+				if(sock->type==sockfrom[a]->type && sock->type==socktype) {
+					nodeAddLink(snode->edittree, nodefrom[a], sockfrom[a], node_to, sock);
+					sockfrom[a]= NULL;
+					break;
+				}
+			}
+		}
+	}
+	
+	ntreeSolveOrder(snode->edittree);
+}
+
+/* can be called from menus too, but they should do own undopush and redraws */
+bNode *node_add_node(SpaceNode *snode, int type, float locx, float locy)
+{
+	bNode *node= NULL, *gnode;
+	
+	node_deselectall(snode, 0);
+	
+	if(type>=NODE_DYNAMIC_MENU) {
+		node= nodeAddNodeType(snode->edittree, type, NULL, NULL);
+	}
+	else if(type>=NODE_GROUP_MENU) {
+		if(snode->edittree!=snode->nodetree) {
+			error("Can not add a Group in a Group");
+			return NULL;
+		}
+		else {
+			bNodeTree *ngroup= BLI_findlink(&G.main->nodetree, type-NODE_GROUP_MENU);
+			if(ngroup)
+				node= nodeAddNodeType(snode->edittree, NODE_GROUP, ngroup, NULL);
+		}
+	}
+	else
+		node= nodeAddNodeType(snode->edittree, type, NULL, NULL);
+	
+	/* generics */
+	if(node) {
+		node->locx= locx;
+		node->locy= locy + 60.0f;		// arbitrary.. so its visible
+		node->flag |= SELECT;
+		
+		gnode= snode_get_editgroup(snode);
+		if(gnode) {
+			node->locx -= gnode->locx;
+			node->locy -= gnode->locy;
+		}
+
+		snode_verify_groups(snode);
+		node_set_active(snode, node);
+		
+		if(node->id)
+			id_us_plus(node->id);
+		
+		if(snode->nodetree->type==NTREE_COMPOSIT)
+			ntreeCompositForceHidden(snode->edittree);
+		
+		NodeTagChanged(snode->edittree, node);
+	}
+	
+	if(snode->nodetree->type==NTREE_TEXTURE) {
+		ntreeTexCheckCyclics(snode->edittree);
+		ntreeTexUpdatePreviews(snode->edittree);
+	}
+	
+	return node;
+}
+
+void node_mute(SpaceNode *snode)
+{
+	bNode *node;
+
+	/* no disabling inside of groups */
+	if(snode_get_editgroup(snode))
+		return;
+	
+	for(node= snode->edittree->nodes.first; node; node= node->next) {
+		if(node->flag & SELECT) {
+			if(node->inputs.first && node->outputs.first) {
+				if(node->flag & NODE_MUTED)
+					node->flag &= ~NODE_MUTED;
+				else
+					node->flag |= NODE_MUTED;
+			}
+		}
+	}
+	
+	// allqueue(REDRAWNODE, 0);
+	BIF_undo_push("Enable/Disable nodes");
+
+}
+
+void node_adduplicate(SpaceNode *snode)
+{
+	
+	ntreeCopyTree(snode->edittree, 1);	/* 1 == internally selected nodes */
+	
+	ntreeSolveOrder(snode->edittree);
+	snode_verify_groups(snode);
+	snode_handle_recalc(snode);
+
+	transform_nodes(snode->edittree, 'g', "Duplicate");
+}
+
+#if 0
+static void node_insert_convertor(SpaceNode *snode, bNodeLink *link)
+{
+	bNode *newnode= NULL;
+	
+	if(link->fromsock->type==SOCK_RGBA && link->tosock->type==SOCK_VALUE) {
+		if(snode->edittree->type==NTREE_SHADER)
+			newnode= node_add_node(snode, SH_NODE_RGBTOBW, 0.0f, 0.0f);
+		else if(snode->edittree->type==NTREE_COMPOSIT)
+			newnode= node_add_node(snode, CMP_NODE_RGBTOBW, 0.0f, 0.0f);
+		else
+			newnode= NULL;
+	}
+	else if(link->fromsock->type==SOCK_VALUE && link->tosock->type==SOCK_RGBA) {
+		if(snode->edittree->type==NTREE_SHADER)
+			newnode= node_add_node(snode, SH_NODE_VALTORGB, 0.0f, 0.0f);
+		else if(snode->edittree->type==NTREE_COMPOSIT)
+			newnode= node_add_node(snode, CMP_NODE_VALTORGB, 0.0f, 0.0f);
+		else
+			newnode= NULL;
+	}
+	
+	if(newnode) {
+		/* dangerous assumption to use first in/out socks, but thats fine for now */
+		newnode->flag |= NODE_HIDDEN;
+		newnode->locx= 0.5f*(link->fromsock->locx + link->tosock->locx);
+		newnode->locy= 0.5f*(link->fromsock->locy + link->tosock->locy) + HIDDEN_RAD;
+		
+		nodeAddLink(snode->edittree, newnode, newnode->outputs.first, link->tonode, link->tosock);
+		link->tonode= newnode;
+		link->tosock= newnode->inputs.first;
+	}
+}
+
+#endif
+
+static void node_remove_extra_links(SpaceNode *snode, bNodeSocket *tsock, bNodeLink *link)
+{
+	bNodeLink *tlink;
+	bNodeSocket *sock;
+	
+	if(tsock && nodeCountSocketLinks(snode->edittree, link->tosock) > tsock->limit) {
+		
+		for(tlink= snode->edittree->links.first; tlink; tlink= tlink->next) {
+			if(link!=tlink && tlink->tosock==link->tosock)
+				break;
+		}
+		if(tlink) {
+			/* is there a free input socket with same type? */
+			for(sock= tlink->tonode->inputs.first; sock; sock= sock->next) {
+				if(sock->type==tlink->fromsock->type)
+					if(nodeCountSocketLinks(snode->edittree, sock) < sock->limit)
+						break;
+			}
+			if(sock) {
+				tlink->tosock= sock;
+				sock->flag &= ~SOCK_HIDDEN;
+			}
+			else {
+				nodeRemLink(snode->edittree, tlink);
+			}
+		}
+	}
+}
+
+/* loop that adds a nodelink, called by function below  */
+/* in_out = starting socket */
+static int node_add_link_drag(SpaceNode *snode, bNode *node, bNodeSocket *sock, int in_out)
+{
+	bNode *tnode;
+	bNodeSocket *tsock= NULL;
+	bNodeLink *link= NULL;
+	short mval[2], mvalo[2], firsttime=1;	/* firsttime reconnects a link broken by caller */
+	
+	/* we make a temporal link */
+	if(in_out==SOCK_OUT)
+		link= nodeAddLink(snode->edittree, node, sock, NULL, NULL);
+	else
+		link= nodeAddLink(snode->edittree, NULL, NULL, node, sock);
+	
+	getmouseco_areawin(mvalo);
+	while (get_mbut() & L_MOUSE) {
+		
+		getmouseco_areawin(mval);
+		if(mval[0]!=mvalo[0] || mval[1]!=mvalo[1] || firsttime) {
+			firsttime= 0;
+			
+			mvalo[0]= mval[0];
+			mvalo[1]= mval[1];
+			
+			if(in_out==SOCK_OUT) {
+				if(find_indicated_socket(snode, &tnode, &tsock, SOCK_IN)) {
+					if(nodeFindLink(snode->edittree, sock, tsock)==NULL) {
+						if(tnode!=node  && link->tonode!=tnode && link->tosock!= tsock) {
+							link->tonode= tnode;
+							link->tosock= tsock;
+							ntreeSolveOrder(snode->edittree);	/* for interactive red line warning */
+						}
+					}
+				}
+				else {
+					link->tonode= NULL;
+					link->tosock= NULL;
+				}
+			}
+			else {
+				if(find_indicated_socket(snode, &tnode, &tsock, SOCK_OUT)) {
+					if(nodeFindLink(snode->edittree, sock, tsock)==NULL) {
+						if(nodeCountSocketLinks(snode->edittree, tsock) < tsock->limit) {
+							if(tnode!=node && link->fromnode!=tnode && link->fromsock!= tsock) {
+								link->fromnode= tnode;
+								link->fromsock= tsock;
+								ntreeSolveOrder(snode->edittree);	/* for interactive red line warning */
+							}
+						}
+					}
+				}
+				else {
+					link->fromnode= NULL;
+					link->fromsock= NULL;
+				}
+			}
+			/* hilight target sockets only */
+			node_socket_hilights(snode, in_out==SOCK_OUT?SOCK_IN:SOCK_OUT);
+			
+			force_draw(0);
+		}
+		else BIF_wait_for_statechange();		
+	}
+	
+	/* remove link? */
+	if(link->tonode==NULL || link->fromnode==NULL) {
+		nodeRemLink(snode->edittree, link);
+	}
+	else {
+		/* send changed events for original tonode and new */
+		if(link->tonode) 
+			NodeTagChanged(snode->edittree, link->tonode);
+		
+		/* we might need to remove a link */
+		if(in_out==SOCK_OUT) node_remove_extra_links(snode, tsock, link);
+	}
+	
+	ntreeSolveOrder(snode->edittree);
+	snode_verify_groups(snode);
+	snode_handle_recalc(snode);
+	
+	// allqueue(REDRAWNODE, 0);
+	BIF_undo_push("Add link");
+
+	return 1;
+}
+
+/* return 1 when socket clicked */
+static int node_add_link(SpaceNode *snode)
+{
+	bNode *node;
+	bNodeLink *link;
+	bNodeSocket *sock;
+	
+	/* output indicated? */
+	if(find_indicated_socket(snode, &node, &sock, SOCK_OUT)) {
+		if(nodeCountSocketLinks(snode->edittree, sock)<sock->limit)
+			return node_add_link_drag(snode, node, sock, SOCK_OUT);
+		else {
+			/* find if we break a link */
+			for(link= snode->edittree->links.first; link; link= link->next) {
+				if(link->fromsock==sock)
+					break;
+			}
+			if(link) {
+				node= link->tonode;
+				sock= link->tosock;
+				nodeRemLink(snode->edittree, link);
+				return node_add_link_drag(snode, node, sock, SOCK_IN);
+			}
+		}
+	}
+	/* or an input? */
+	else if(find_indicated_socket(snode, &node, &sock, SOCK_IN)) {
+		if(nodeCountSocketLinks(snode->edittree, sock)<sock->limit)
+			return node_add_link_drag(snode, node, sock, SOCK_IN);
+		else {
+			/* find if we break a link */
+			for(link= snode->edittree->links.first; link; link= link->next) {
+				if(link->tosock==sock)
+					break;
+			}
+			if(link) {
+				/* send changed event to original tonode */
+				if(link->tonode) 
+					NodeTagChanged(snode->edittree, link->tonode);
+				
+				node= link->fromnode;
+				sock= link->fromsock;
+				nodeRemLink(snode->edittree, link);
+				return node_add_link_drag(snode, node, sock, SOCK_OUT);
+			}
+		}
+	}
+	
+	return 0;
+}
+
+void node_delete(SpaceNode *snode)
+{
+	bNode *node, *next;
+	bNodeSocket *sock;
+	
+	for(node= snode->edittree->nodes.first; node; node= next) {
+		next= node->next;
+		if(node->flag & SELECT) {
+			/* set selin and selout NULL if the sockets belong to a node to be deleted */
+			for(sock= node->inputs.first; sock; sock= sock->next)
+				if(snode->edittree->selin == sock) snode->edittree->selin= NULL;
+
+			for(sock= node->outputs.first; sock; sock= sock->next)
+				if(snode->edittree->selout == sock) snode->edittree->selout= NULL;
+
+			/* check id user here, nodeFreeNode is called for free dbase too */
+			if(node->id)
+				node->id->us--;
+			nodeFreeNode(snode->edittree, node);
+		}
+	}
+	
+	snode_verify_groups(snode);
+	snode_handle_recalc(snode);
+	BIF_undo_push("Delete nodes");
+	// allqueue(REDRAWNODE, 1);
+}
+
+void node_hide(SpaceNode *snode)
+{
+	bNode *node;
+	int nothidden=0, ishidden=0;
+	
+	for(node= snode->edittree->nodes.first; node; node= node->next) {
+		if(node->flag & SELECT) {
+			if(node->flag & NODE_HIDDEN)
+				ishidden++;
+			else
+				nothidden++;
+		}
+	}
+	for(node= snode->edittree->nodes.first; node; node= node->next) {
+		if(node->flag & SELECT) {
+			if( (ishidden && nothidden) || ishidden==0)
+				node->flag |= NODE_HIDDEN;
+			else 
+				node->flag &= ~NODE_HIDDEN;
+		}
+	}
+	BIF_undo_push("Hide nodes");
+	// allqueue(REDRAWNODE, 1);
+}
+
+void node_insert_key(SpaceNode *snode)
+{
+	bNode *node= editnode_get_active(snode->edittree);
+	
+	if(node == NULL)
+		return;
+	
+	if(node->type==CMP_NODE_TIME) {
+		if(node->custom1<node->custom2) {
+
+			CurveMapping *cumap= node->storage;
+			float fval, curval;
+		
+			curval= (float)(CFRA - node->custom1)/(float)(node->custom2-node->custom1);
+			fval= curvemapping_evaluateF(cumap, 0, curval);
+			
+			if(fbutton(&fval, 0.0f, 1.0f, 10, 10, "Insert Value")) {
+				curvemap_insert(cumap->cm, curval, fval);
+
+				BIF_undo_push("Insert key in Time node");
+				// allqueue(REDRAWNODE, 1);
+			}
+		}
+	}
+}
+
+void node_select_linked(SpaceNode *snode, int out)
+{
+	bNodeLink *link;
+	bNode *node;
+	
+	/* NODE_TEST is the free flag */
+	for(node= snode->edittree->nodes.first; node; node= node->next)
+		node->flag &= ~NODE_TEST;
+
+	for(link= snode->edittree->links.first; link; link= link->next) {
+		if(out) {
+			if(link->fromnode->flag & NODE_SELECT)
+				link->tonode->flag |= NODE_TEST;
+		}
+		else {
+			if(link->tonode->flag & NODE_SELECT)
+				link->fromnode->flag |= NODE_TEST;
+		}
+	}
+	
+	for(node= snode->edittree->nodes.first; node; node= node->next)
+		if(node->flag & NODE_TEST)
+			node->flag |= NODE_SELECT;
+	
+	BIF_undo_push("Select Linked nodes");
+	// allqueue(REDRAWNODE, 1);
+}
+
+/* makes a link between selected output and input sockets */
+void node_make_link(SpaceNode *snode)
+{
+	bNode *fromnode, *tonode;
+	bNodeLink *link;
+	bNodeSocket *outsock= snode->edittree->selout;
+	bNodeSocket *insock= snode->edittree->selin;
+
+	if(!insock || !outsock) return;
+	if(nodeFindLink(snode->edittree, outsock, insock)) return;
+
+	if(nodeFindNode(snode->edittree, outsock, &fromnode, NULL) &&
+		nodeFindNode(snode->edittree, insock, &tonode, NULL)) {
+		link= nodeAddLink(snode->edittree, fromnode, outsock, tonode, insock);
+		NodeTagChanged(snode->edittree, tonode);
+		node_remove_extra_links(snode, insock, link);
+	}
+	else return;
+
+	ntreeSolveOrder(snode->edittree);
+	snode_verify_groups(snode);
+	snode_handle_recalc(snode);
+
+	// allqueue(REDRAWNODE, 0);
+	BIF_undo_push("Make Link Between Sockets");
+}
+
+static void node_border_link_delete(SpaceNode *snode)
+{
+	rcti rect;
+	short val, mval[2], mvalo[2];
+
+	/* to make this work more friendly, we first wait for a mouse move */
+	getmouseco_areawin(mvalo);
+	while (get_mbut() & L_MOUSE) {
+		getmouseco_areawin(mval);
+		if(mval[0]!=mvalo[0] || mval[1]!=mvalo[1])
+			break;
+		else BIF_wait_for_statechange();
+	}
+	if((get_mbut() & L_MOUSE)==0)
+		return;
+	
+	/* now change cursor and draw border */
+	setcursor_space(SPACE_NODE, CURSOR_VPAINT);
+	
+	if ( (val = get_border(&rect, 2)) ) {
+		if(rect.xmin<rect.xmax && rect.ymin<rect.ymax) {
+			//#define NODE_MAXPICKBUF	256
+			bNodeLink *link, *next;
+			GLuint buffer[256];
+			rctf rectf;
+			int code=0, hits;
+			
+			mval[0]= rect.xmin;
+			mval[1]= rect.ymin;
+			areamouseco_to_ipoco(&snode->v2d, mval, &rectf.xmin, &rectf.ymin);
+			mval[0]= rect.xmax;
+			mval[1]= rect.ymax;
+			areamouseco_to_ipoco(&snode->v2d, mval, &rectf.xmax, &rectf.ymax);
+			
+			glLoadIdentity();
+			myortho2(rectf.xmin, rectf.xmax, rectf.ymin, rectf.ymax);
+			
+			glSelectBuffer(256, buffer); 
+			glRenderMode(GL_SELECT);
+			glInitNames();
+			glPushName(-1);
+			
+			/* draw links */
+			for(link= snode->edittree->links.first; link; link= link->next) {
+				glLoadName(code++);
+				node_draw_link(snode, link);
+			}
+			
+			hits= glRenderMode(GL_RENDER);
+			glPopName();
+			if(hits>0) {
+				int a;
+				for(a=0; a<hits; a++) {
+					bNodeLink *link= BLI_findlink(&snode->edittree->links, buffer[ (4 * a) + 3]);
+					if(link)
+						link->fromnode= NULL;	/* first tag for delete, otherwise indices are wrong */
+				}
+				for(link= snode->edittree->links.first; link; link= next) {
+					next= link->next;
+					if(link->fromnode==NULL) {
+						NodeTagChanged(snode->edittree, link->tonode);
+						nodeRemLink(snode->edittree, link);
+					}
+				}
+				ntreeSolveOrder(snode->edittree);
+				snode_verify_groups(snode);
+				snode_handle_recalc(snode);
+			}
+			// allqueue(REDRAWNODE, 0);
+			BIF_undo_push("Erase links");
+		}
+	}
+	
+	setcursor_space(SPACE_NODE, CURSOR_STD);
+}
+
+/* goes over all scenes, reads render layerss */
+void node_read_renderlayers(SpaceNode *snode)
+{
+	Scene *scene;
+	bNode *node;
+
+	/* first tag scenes unread */
+	for(scene= G.main->scene.first; scene; scene= scene->id.next) 
+		scene->id.flag |= LIB_DOIT;
+
+	for(node= snode->edittree->nodes.first; node; node= node->next) {
+		if(node->type==CMP_NODE_R_LAYERS) {
+			ID *id= node->id;
+			if(id==NULL) id= (ID *)G.scene;
+			if(id->flag & LIB_DOIT) {
+				RE_ReadRenderResult(G.scene, (Scene *)id);
+				ntreeCompositTagRender((Scene *)id);
+				id->flag &= ~LIB_DOIT;
+			}
+		}
+	}
+	
+	/* own render result should be read/allocated */
+	if(G.scene->id.flag & LIB_DOIT)
+		RE_ReadRenderResult(G.scene, G.scene);
+	
+	snode_handle_recalc(snode);
+}
+
+void node_read_fullsamplelayers(SpaceNode *snode)
+{
+	Render *re= RE_NewRender(G.scene->id.name);
+
+	waitcursor(1);
+
+	BIF_init_render_callbacks(re, 1);
+	RE_MergeFullSample(re, G.scene, snode->nodetree);
+	BIF_end_render_callbacks();
+	
+	// allqueue(REDRAWNODE, 1);
+	// allqueue(REDRAWIMAGE, 1);
+	
+	waitcursor(0);
+}
+
+/* called from header_info, when deleting a scene
+ * goes over all scenes other than the input, checks if they have
+ * render layer nodes referencing the to-be-deleted scene, and
+ * resets them to NULL. */
+void clear_scene_in_nodes(Scene *sce)
+{
+	Scene *sce1;
+	bNode *node;
+
+	sce1= G.main->scene.first;
+	while(sce1) {
+		if(sce1!=sce) {
+			if (sce1->nodetree) {
+				for(node= sce1->nodetree->nodes.first; node; node= node->next) {
+					if(node->type==CMP_NODE_R_LAYERS) {
+						Scene *nodesce= (Scene *)node->id;
+						
+						if (nodesce==sce) node->id = NULL;
+					}
+				}
+			}
+		}
+		sce1= sce1->id.next;
+	}
+}
+
+
+/* gets active viewer user */
+struct ImageUser *ntree_get_active_iuser(bNodeTree *ntree)
+{
+	bNode *node;
+	
+	if(ntree)
+		for(node= ntree->nodes.first; node; node= node->next)
+			if( ELEM(node->type, CMP_NODE_VIEWER, CMP_NODE_SPLITVIEWER)) 
+				if(node->flag & NODE_DO_OUTPUT)
+					return node->storage;
+	return NULL;
+}
+
+void imagepaint_composite_tags(bNodeTree *ntree, Image *image, ImageUser *iuser)
+{
+	bNode *node;
+	
+	if(ntree==NULL)
+		return;
+	
+	/* search for renderresults */
+	if(image->type==IMA_TYPE_R_RESULT) {
+		for(node= ntree->nodes.first; node; node= node->next) {
+			if(node->type==CMP_NODE_R_LAYERS && node->id==NULL) {
+				/* imageuser comes from ImageWin, so indexes are offset 1 */
+				if(node->custom1==iuser->layer-1)
+					NodeTagChanged(ntree, node);
+			}
+		}
+	}
+	else {
+		for(node= ntree->nodes.first; node; node= node->next) {
+			if(node->id== &image->id)
+				NodeTagChanged(ntree, node);
+		}
+	}
+}
+
+/* ********************** */
+
+void node_make_group(SpaceNode *snode)
+{
+	bNode *gnode;
+	
+	if(snode->edittree!=snode->nodetree) {
+		error("Can not add a new Group in a Group");
+		return;
+	}
+	
+	/* for time being... is too complex to handle */
+	if(snode->treetype==NTREE_COMPOSIT) {
+		for(gnode=snode->nodetree->nodes.first; gnode; gnode= gnode->next) {
+			if(gnode->flag & SELECT)
+				if(gnode->type==CMP_NODE_R_LAYERS)
+					break;
+		}
+		if(gnode) {
+			error("Can not add RenderLayer in a Group");
+			return;
+		}
+	}
+	
+	gnode= nodeMakeGroupFromSelected(snode->nodetree);
+	if(gnode==NULL) {
+		error("Can not make Group");
+	}
+	else {
+		nodeSetActive(snode->nodetree, gnode);
+		ntreeSolveOrder(snode->nodetree);
+		// allqueue(REDRAWNODE, 0);
+		BIF_undo_push("Make Node Group");
+	}
+}
+
+/* ******************** main event loop ****************** */
+
+/* special version to prevent overlapping buttons, has a bit of hack... */
+/* yes, check for example composit_node_event(), file window use... */
+static int node_uiDoBlocks(ScrArea *sa, short event)
+{
+	SpaceNode *snode= sa->spacedata.first;
+	ListBase *lb= &sa->uiblocks;
+	ListBase listb= *lb;
+	uiBlock *block;
+	bNode *node;
+	rctf rect;
+	void *prev, *next;
+	int retval= UI_NOTHING;
+	short mval[2];
+	
+	getmouseco_areawin(mval);
+	areamouseco_to_ipoco(G.v2d, mval, &rect.xmin, &rect.ymin);
+
+	/* this happens after filesel usage... */
+	if(lb->first==NULL) {
+		return UI_NOTHING;
+	}
+	
+	/* evil hack: try to do grease-pencil floating panel (like for nodes) */
+	block= uiGetBlock("nodes_panel_gpencil", sa);
+	if (block) {
+		/* try to process events here... if failed, just carry on */
+			/* when there's menus, the prev pointer becomes zero! */
+		prev= ((struct Link *)block)->prev;
+		next= ((struct Link *)block)->next;
+		((struct Link *)block)->prev= NULL;
+		((struct Link *)block)->next= NULL;
+		
+		lb->first= lb->last= block;
+		retval= uiDoBlocks(lb, event, 1);
+		
+		((struct Link *)block)->prev= prev;
+		((struct Link *)block)->next= next;
+		
+		*lb= listb;
+		
+		/* if something happened, get the heck outta here */
+		if (retval != UI_NOTHING)
+			return retval;
+	}
+	
+	
+	rect.xmin -= 2.0f;
+	rect.ymin -= 2.0f;
+	rect.xmax = rect.xmin + 4.0f;
+	rect.ymax = rect.ymin + 4.0f;
+	
+	for(node= snode->edittree->nodes.first; node; node= node->next) {
+		char str[32];
+		
+		/* retreive unique block name, see also drawnode.c */
+		sprintf(str, "node buttons %p", node);
+		block= uiGetBlock(str, sa);
+		
+		if(block) {
+			if(node == visible_node(snode, &rect)) {
+
+				/* when there's menus, the prev pointer becomes zero! */
+				prev= ((struct Link *)block)->prev;
+				next= ((struct Link *)block)->next;
+				((struct Link *)block)->prev= NULL;
+				((struct Link *)block)->next= NULL;
+				
+				lb->first= lb->last= block;
+				retval= uiDoBlocks(lb, event, 1);
+				
+				((struct Link *)block)->prev= prev;
+				((struct Link *)block)->next= next;
+
+				break;
+			}
+		}
+	}
+	
+	*lb= listb;
+	
+	return retval;
+}
+
+void winqreadnodespace(ScrArea *sa, void *spacedata, BWinEvent *evt)
+{
+	SpaceNode *snode= spacedata;
+	bNode *actnode;
+	bNodeSocket *actsock;
+	unsigned short event= evt->event;
+	short val= evt->val, doredraw=0, fromlib= 0;
+	
+	if(sa->win==0) return;
+	
+	if(snode->nodetree==NULL) {
+		/* no other events should be handled, but floating panels still should get handled */
+		uiDoBlocks(&curarea->uiblocks, event, 1);
+		return;
+	}
+	
+	if(val) {
+		if( node_uiDoBlocks(sa, event)!=UI_NOTHING ) event= 0;
+		
+		fromlib= (snode->id && snode->id->lib);
+		
+		switch(event) {
+		case LEFTMOUSE:
+			if(gpencil_do_paint(sa, L_MOUSE)) {
+				return;
+			}
+			else if(fromlib) {
+				if(node_mouse_groupheader(snode)==0)
+					node_mouse_select(snode, event);
+			}
+			else {
+				
+				if(G.qual & LR_CTRLKEY)
+					if(gesture())
+						break;
+					
+				if(node_add_link(snode)==0)
+					if(node_mouse_groupheader(snode)==0)
+						if(node_mouse_select(snode, event)==0)
+							node_border_link_delete(snode);
+			}
+			break;
+			
+		case RIGHTMOUSE: 
+			if(gpencil_do_paint(sa, R_MOUSE)) {
+				return;
+			}
+			else if(find_indicated_socket(snode, &actnode, &actsock, SOCK_IN)) {
+				if(actsock->flag & SOCK_SEL) {
+					snode->edittree->selin= NULL;
+					actsock->flag&= ~SOCK_SEL;
+				}
+				else {
+					snode->edittree->selin= actsock;
+					reset_sel_socket(snode, SOCK_IN);
+					actsock->flag|= SOCK_SEL;
+				}
+			}
+			else if(find_indicated_socket(snode, &actnode, &actsock, SOCK_OUT)) {
+				if(actsock->flag & SOCK_SEL) {
+					snode->edittree->selout= NULL;
+					actsock->flag&= ~SOCK_SEL;
+				}
+				else {
+					snode->edittree->selout= actsock;
+					reset_sel_socket(snode, SOCK_OUT);
+					actsock->flag|= SOCK_SEL;
+				}
+			}
+			else if(!node_mouse_select(snode, event)) 
+				toolbox_n();
+
+			break;
+		case MIDDLEMOUSE:
+			if((snode->flag & SNODE_BACKDRAW) && (snode->treetype==NTREE_COMPOSIT)
+			   && (G.qual==LR_SHIFTKEY)) {
+				snode_bg_viewmove(snode);
+			} else {
+				view2dmove(event);
+			}
+		case WHEELUPMOUSE:
+		case WHEELDOWNMOUSE:
+			view2dmove(event);	/* in drawipo.c */
+			break;
+			
+		case MOUSEY:
+			doredraw= node_socket_hilights(snode, SOCK_IN|SOCK_OUT);
+			break;
+		
+		case UI_BUT_EVENT:
+			/* future: handlerize this! */
+			if(snode->treetype==NTREE_SHADER)
+				shader_node_event(snode, val);
+			else if(snode->treetype==NTREE_COMPOSIT)
+				composit_node_event(snode, val);
+			else if(snode->treetype==NTREE_TEXTURE)
+				texture_node_event(snode, val);
+			break;
+			
+		case RENDERPREVIEW:
+			if(snode->treetype==NTREE_SHADER)
+				shader_node_previewrender(sa, snode);
+			break;
+			
+		case PADPLUSKEY:
+			snode_zoom_in(sa);
+			doredraw= 1;
+			break;
+		case PADMINUS:
+			snode_zoom_out(sa);
+			doredraw= 1;
+			break;
+		case HOMEKEY:
+			snode_home(sa, snode);
+			doredraw= 1;
+			break;
+		case TABKEY:
+			if(fromlib) fromlib= -1;
+			else snode_make_group_editable(snode, NULL);
+			break;
+			
+		case AKEY:
+			if(G.qual==LR_SHIFTKEY) {
+				if(fromlib) fromlib= -1;
+				else toolbox_n_add();
+			}
+			else if(G.qual==0) {
+				node_deselectall(snode, 1);
+				BIF_undo_push("Deselect all nodes");
+			}
+			break;
+		case BKEY:
+			if(G.qual==0)
+				node_border_select(snode);
+			break;
+		case CKEY:	/* sort again, showing cyclics */
+			ntreeSolveOrder(snode->edittree);
+			doredraw= 1;
+			break;
+		case DKEY:
+			if(G.qual==LR_SHIFTKEY) {
+				if(fromlib) fromlib= -1;
+				else node_adduplicate(snode);
+			}
+			break;
+		case EKEY:
+			snode_handle_recalc(snode);
+			break;
+		case FKEY:
+			node_make_link(snode);
+			break;
+		case GKEY:
+			if(fromlib) fromlib= -1;
+			else {
+				if(G.qual==LR_CTRLKEY) {
+					if(okee("Make Group"))
+						node_make_group(snode);
+				}
+				else if(G.qual==LR_ALTKEY) {
+					if(okee("Ungroup"))
+						node_ungroup(snode);
+				}
+				else if(G.qual==LR_SHIFTKEY) {
+					node_addgroup(snode);
+				}
+				else
+					transform_nodes(snode->edittree, 'g', "Move Node");
+			}
+			break;
+		case HKEY:
+			node_hide(snode);
+			break;
+		case IKEY:
+			node_insert_key(snode);
+			break;
+		case LKEY:
+			node_select_linked(snode, G.qual==LR_SHIFTKEY);
+			break;
+		case MKEY:
+			node_mute(snode);
+			break;
+		case RKEY:
+			if(G.qual==LR_CTRLKEY) {
+				node_rename(snode);
+			} 
+			else if(G.qual==LR_SHIFTKEY) {
+				if(okee("Read saved Full Sample Layers"))
+					node_read_fullsamplelayers(snode);
+			}
+			else {
+				if(okee("Read saved Render Layers"))
+					node_read_renderlayers(snode);
+			}
+			break;
+		case DELKEY:
+		case XKEY:
+			if(G.qual==LR_ALTKEY) {
+				gpencil_delete_menu();
+			}
+			else {
+				if(fromlib) fromlib= -1;
+				else node_delete(snode);
+			}
+			break;
+		}
+	}
+
+	if(fromlib==-1)
+		error_libdata();
+	if(doredraw)
+		scrarea_queue_winredraw(sa);
+	if(doredraw==2)
+		scrarea_queue_headredraw(sa);
+}
+#endif
+
diff --git a/source/blender/editors/space_node/node_header.c b/source/blender/editors/space_node/node_header.c
index 3b11a6e05e7..667d1c749d1 100644
--- a/source/blender/editors/space_node/node_header.c
+++ b/source/blender/editors/space_node/node_header.c
@@ -30,6 +30,7 @@
 #include <stdio.h>
 
 #include "DNA_space_types.h"
+#include "DNA_node_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_windowmanager_types.h"
@@ -62,7 +63,7 @@
 
 static void do_viewmenu(bContext *C, void *arg, int event)
 {
-	
+
 }
 
 static uiBlock *dummy_viewmenu(bContext *C, uiMenuBlockHandle *handle, void *arg_unused)
@@ -123,7 +124,7 @@ void node_header_buttons(const bContext *C, ARegion *ar)
 	uiBlockSetEmboss(block, UI_EMBOSS);
 
 	/* always as last  */
-	UI_view2d_totRect_set(&ar->v2d, xco+XIC+80, ar->v2d.tot.ymax-ar->v2d.tot.ymin);
+	UI_view2d_totRect_set(&ar->v2d, xco+XIC+80, (int)(ar->v2d.tot.ymax-ar->v2d.tot.ymin));
 	
 	uiEndBlock(C, block);
 	uiDrawBlock(block);
diff --git a/source/blender/editors/space_node/node_intern.h b/source/blender/editors/space_node/node_intern.h
index 8d0e64a679a..4979ed2ebf3 100644
--- a/source/blender/editors/space_node/node_intern.h
+++ b/source/blender/editors/space_node/node_intern.h
@@ -30,10 +30,23 @@
 
 /* internal exports only */
 
+struct ARegion;
+struct View2D;
+struct bContext;
+
 
 /* node_header.c */
 void node_header_buttons(const bContext *C, ARegion *ar);
 
+/* node_draw.c */
+void drawnodespace(const bContext *C, ARegion *ar, View2D *v2d);
+
+/* drawnode.c */
+void node_draw_link(View2D *v2d, SpaceNode *snode, bNodeLink *link);
+void node_draw_link_bezier(View2D *v2d, float vec[][3], int th_col1, int th_col2, int do_shaded);
+
+/* node_edit.c */
+void snode_set_context(SpaceNode *snode, Scene *scene);
 
 #endif /* ED_NODE_INTERN_H */
 
diff --git a/source/blender/editors/space_node/space_node.c b/source/blender/editors/space_node/space_node.c
index 2cba586b0a9..0427c820ffd 100644
--- a/source/blender/editors/space_node/space_node.c
+++ b/source/blender/editors/space_node/space_node.c
@@ -101,11 +101,10 @@ static SpaceLink *node_new(const bContext *C)
 	ar->v2d.minzoom= 0.5f;
 	ar->v2d.maxzoom= 1.21f;
 	
-	ar->v2d.scroll= 0;
+	ar->v2d.scroll= (V2D_SCROLL_RIGHT|V2D_SCROLL_BOTTOM);
 	ar->v2d.keepzoom= V2D_KEEPZOOM|V2D_KEEPASPECT;
 	ar->v2d.keeptot= 0;
 	
-	
 	return (SpaceLink *)snode;
 }
 
@@ -152,32 +151,11 @@ static void node_main_area_init(wmWindowManager *wm, ARegion *ar)
 static void node_main_area_draw(const bContext *C, ARegion *ar)
 {
 	/* draw entirely, view changes should be handled here */
-	// SpaceNode *snode= (SpaceNode*)CTX_wm_space_data(C);
+	//SpaceNode *snode= (SpaceNode*)CTX_wm_space_data(C);
 	View2D *v2d= &ar->v2d;
-	//View2DGrid *grid;
-	float col[3];
-	
-	/* clear and setup matrix */
-	UI_GetThemeColor3fv(TH_BACK, col);
-	glClearColor(col[0], col[1], col[2], 0.0);
-	glClear(GL_COLOR_BUFFER_BIT);
 	
-	UI_view2d_view_ortho(C, v2d);
-	
-#if 0
-	/* grid */
-	grid= UI_view2d_grid_calc(C, v2d, V2D_UNIT_VALUES, V2D_GRID_CLAMP, V2D_UNIT_VALUES, V2D_GRID_CLAMP, ar->winx, ar->winy);
-	UI_view2d_grid_draw(C, v2d, grid, V2D_GRIDLINES_ALL);
-	UI_view2d_grid_free(grid);
-#endif
-	
-	/* data... */
-	
-	
-	/* reset view matrix */
-	UI_view2d_view_restore(C);
+	drawnodespace(C, ar, v2d);
 	
-	/* scrollers? */
 }
 
 void node_operatortypes(void)