[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34040] trunk/blender/source/blender/ editors: Todo items:

[Ton Roosendaal]

Revision: 34040
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=34040
Author:   ton
Date:     2011-01-03 15:36:44 +0100 (Mon, 03 Jan 2011)

Log Message:
-----------
Todo items:

- New Node editor now opens with larger view, the default
  was like zoomed in factor 2.
- Add node via menu now shows new node more visible
- Click on (material) node now doesn't re-render the entire
  tree anymore, much nicer.
- Duplicate node creates preview image immediate

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_buttons/space_buttons.c
    trunk/blender/source/blender/editors/space_node/node_edit.c
    trunk/blender/source/blender/editors/space_node/node_header.c
    trunk/blender/source/blender/editors/space_node/node_select.c
    trunk/blender/source/blender/editors/space_node/space_node.c

Modified: trunk/blender/source/blender/editors/space_buttons/space_buttons.c
===================================================================
--- trunk/blender/source/blender/editors/space_buttons/space_buttons.c	2011-01-03 14:30:59 UTC (rev 34039)
+++ trunk/blender/source/blender/editors/space_buttons/space_buttons.c	2011-01-03 14:36:44 UTC (rev 34040)
@@ -347,6 +347,10 @@
 					break;
 			}
 			break;
+		case NC_NODE:
+			if(wmn->action==NA_SELECTED)
+				ED_area_tag_redraw(sa);
+			break;
 		/* Listener for preview render, when doing an global undo. */
 		case NC_WINDOW:
 			ED_area_tag_redraw(sa);

Modified: trunk/blender/source/blender/editors/space_node/node_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_edit.c	2011-01-03 14:30:59 UTC (rev 34039)
+++ trunk/blender/source/blender/editors/space_node/node_edit.c	2011-01-03 14:36:44 UTC (rev 34040)
@@ -1464,7 +1464,7 @@
 	/* generics */
 	if(node) {
 		node->locx= locx;
-		node->locy= locy + 60.0f;		// arbitrary.. so its visible
+		node->locy= locy + 60.0f;		// arbitrary.. so its visible, (0,0) is top of node
 		node->flag |= SELECT;
 		
 		gnode= node_tree_get_editgroup(snode->nodetree);
@@ -1515,6 +1515,12 @@
 
 	ntreeCopyTree(snode->edittree, 1);	/* 1 == internally selected nodes */
 	
+	/* to ensure redraws or rerenders happen */
+	for(node= snode->edittree->nodes.first; node; node= node->next)
+		if(node->flag & SELECT)
+			if(node->id)
+				ED_node_changed_update(node->id, node);
+	
 	ntreeSolveOrder(snode->edittree);
 	node_tree_verify_groups(snode->nodetree);
 	snode_notify(C, snode);

Modified: trunk/blender/source/blender/editors/space_node/node_header.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_header.c	2011-01-03 14:30:59 UTC (rev 34039)
+++ trunk/blender/source/blender/editors/space_node/node_header.c	2011-01-03 14:36:44 UTC (rev 34040)
@@ -58,8 +58,22 @@
 static void do_node_add(bContext *C, void *UNUSED(arg), int event)
 {
 	SpaceNode *snode= CTX_wm_space_node(C);
+	ScrArea *sa= CTX_wm_area(C);
+	ARegion *ar;
 	bNode *node;
 	
+	/* get location to add node at mouse */
+	for(ar=sa->regionbase.first; ar; ar=ar->next) {
+		if(ar->regiontype == RGN_TYPE_WINDOW) {
+			wmWindow *win= CTX_wm_window(C);
+			int x= win->eventstate->x - ar->winrct.xmin;
+			int y= win->eventstate->y - ar->winrct.ymin;
+			
+			if(y < 60) y+= 60;
+			UI_view2d_region_to_view(&ar->v2d, x, y, &snode->mx, &snode->my);
+		}
+	}
+	
 	/* store selection in temp test flag */
 	for(node= snode->edittree->nodes.first; node; node= node->next) {
 		if(node->flag & NODE_SELECT) node->flag |= NODE_TEST;
@@ -152,21 +166,9 @@
 
 static void node_menu_add(const bContext *C, Menu *menu)
 {
+	SpaceNode *snode= CTX_wm_space_node(C);
 	uiLayout *layout= menu->layout;
-	SpaceNode *snode= CTX_wm_space_node(C);
-	ScrArea *sa= CTX_wm_area(C);
-	ARegion *ar;
 
-	/* get location to add node at mouse */
-	for(ar=sa->regionbase.first; ar; ar=ar->next) {
-		if(ar->regiontype == RGN_TYPE_WINDOW) {
-			wmWindow *win= CTX_wm_window(C);
-			UI_view2d_region_to_view(&ar->v2d,
-				win->eventstate->x - ar->winrct.xmin, win->eventstate->y - ar->winrct.ymin, 
-				&snode->mx, &snode->my);
-		}
-	}
-
 	if(!snode->nodetree)
 		uiLayoutSetActive(layout, 0);
 

Modified: trunk/blender/source/blender/editors/space_node/node_select.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_select.c	2011-01-03 14:30:59 UTC (rev 34039)
+++ trunk/blender/source/blender/editors/space_node/node_select.c	2011-01-03 14:36:44 UTC (rev 34040)
@@ -108,13 +108,6 @@
 	
 	/* perform the select */
 	node= node_mouse_select(snode, ar, mval, extend);
-
-	/* WATCH THIS, there are a few other ways to change the active material */
-	if(node) {
-		if (node->id && ELEM(GS(node->id->name), ID_MA, ID_TE)) {
-			WM_event_add_notifier(C, NC_MATERIAL|ND_SHADING_DRAW, node->id);
-		}
-	}
 	
 	/* send notifiers */
 	WM_event_add_notifier(C, NC_NODE|NA_SELECTED, NULL);

Modified: trunk/blender/source/blender/editors/space_node/space_node.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/space_node.c	2011-01-03 14:30:59 UTC (rev 34039)
+++ trunk/blender/source/blender/editors/space_node/space_node.c	2011-01-03 14:36:44 UTC (rev 34040)
@@ -118,15 +118,15 @@
 	BLI_addtail(&snode->regionbase, ar);
 	ar->regiontype= RGN_TYPE_WINDOW;
 	
-	ar->v2d.tot.xmin=  -10.0f;
-	ar->v2d.tot.ymin=  -10.0f;
-	ar->v2d.tot.xmax= 512.0f;
-	ar->v2d.tot.ymax= 512.0f;
+	ar->v2d.tot.xmin=  -256.0f;
+	ar->v2d.tot.ymin=  -256.0f;
+	ar->v2d.tot.xmax= 768.0f;
+	ar->v2d.tot.ymax= 768.0f;
 	
-	ar->v2d.cur.xmin=  0.0f;
-	ar->v2d.cur.ymin=  0.0f;
-	ar->v2d.cur.xmax= 512.0f;
-	ar->v2d.cur.ymax= 512.0f;
+	ar->v2d.cur.xmin=  -256.0f;
+	ar->v2d.cur.ymin=  -256.0f;
+	ar->v2d.cur.xmax= 768.0f;
+	ar->v2d.cur.ymax= 768.0f;
 	
 	ar->v2d.min[0]= 1.0f;
 	ar->v2d.min[1]= 1.0f;