[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28466] branches/render25: Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28457 :28464

[Campbell Barton]

Revision: 28466
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28466
Author:   campbellbarton
Date:     2010-04-27 17:56:06 +0200 (Tue, 27 Apr 2010)

Log Message:
-----------
Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28457:28464

Modified Paths:
--------------
    branches/render25/intern/guardedalloc/intern/mallocn.c
    branches/render25/source/blender/editors/physics/particle_edit.c
    branches/render25/source/blender/editors/space_node/node_select.c
    branches/render25/source/blender/editors/space_node/space_node.c

Modified: branches/render25/intern/guardedalloc/intern/mallocn.c
===================================================================
--- branches/render25/intern/guardedalloc/intern/mallocn.c	2010-04-27 15:55:35 UTC (rev 28465)
+++ branches/render25/intern/guardedalloc/intern/mallocn.c	2010-04-27 15:56:06 UTC (rev 28466)
@@ -82,7 +82,7 @@
 	/* note: keep this struct aligned (e.g., irix/gcc) - Hos */
 typedef struct MemHead {
 	int tag1;
-	int len;
+	unsigned int len;
 	struct MemHead *next,*prev;
 	const char * name;
 	const char * nextname;

Modified: branches/render25/source/blender/editors/physics/particle_edit.c
===================================================================
--- branches/render25/source/blender/editors/physics/particle_edit.c	2010-04-27 15:55:35 UTC (rev 28465)
+++ branches/render25/source/blender/editors/physics/particle_edit.c	2010-04-27 15:56:06 UTC (rev 28466)
@@ -2376,11 +2376,12 @@
 	HairKey *hkey;
 	float weight;
 	ParticleBrushData *brush= &pset->brush[pset->brushtype];
-	edit= psys->edit;
+    float factor= RNA_float_get(op->ptr, "factor");
     
     float factor= RNA_float_get(op->ptr, "factor");
 
 	weight= brush->strength;
+	edit= psys->edit;
 
 	LOOP_SELECTED_POINTS {
 		ParticleData *pa= psys->particles + p;

Modified: branches/render25/source/blender/editors/space_node/node_select.c
===================================================================
--- branches/render25/source/blender/editors/space_node/node_select.c	2010-04-27 15:55:35 UTC (rev 28465)
+++ branches/render25/source/blender/editors/space_node/node_select.c	2010-04-27 15:56:06 UTC (rev 28466)
@@ -112,9 +112,6 @@
 	/* perform the select */
 	node= node_mouse_select(snode, ar, mval, extend);
 
-	/* need refresh/a notifier vs compo notifier */
-	WM_event_add_notifier(C, NC_SCENE|ND_NODES, NULL); /* Do we need to pass the scene? */
-
 	/* 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)) {
@@ -191,7 +188,7 @@
 		}
 	}
 	
-	WM_event_add_notifier(C, NC_SCENE|ND_NODES, NULL); /* Do we need to pass the scene? */
+	WM_event_add_notifier(C, NC_NODE|ND_NODE_SELECT, NULL);
 
 	return OPERATOR_FINISHED;
 }
@@ -267,7 +264,7 @@
 			node->flag |= NODE_SELECT;
 	}
 	
-	WM_event_add_notifier(C, NC_SCENE|ND_NODES, NULL);
+	WM_event_add_notifier(C, NC_NODE|ND_NODE_SELECT, NULL);
 	return OPERATOR_FINISHED;
 }
 
@@ -307,7 +304,7 @@
 			node->flag |= NODE_SELECT;
 	}
 	
-	WM_event_add_notifier(C, NC_SCENE|ND_NODES, NULL);
+	WM_event_add_notifier(C, NC_NODE|ND_NODE_SELECT, NULL);
 	return OPERATOR_FINISHED;
 }
 
@@ -347,7 +344,7 @@
 			node->flag |= NODE_SELECT;
 	}
 	
-	WM_event_add_notifier(C, NC_SCENE|ND_NODES, NULL);
+	WM_event_add_notifier(C, NC_NODE|ND_NODE_SELECT, NULL);
 	return OPERATOR_FINISHED;
 }
 

Modified: branches/render25/source/blender/editors/space_node/space_node.c
===================================================================
--- branches/render25/source/blender/editors/space_node/space_node.c	2010-04-27 15:55:35 UTC (rev 28465)
+++ branches/render25/source/blender/editors/space_node/space_node.c	2010-04-27 15:56:06 UTC (rev 28466)
@@ -199,7 +199,8 @@
 				ED_area_tag_redraw(sa);
 			break;
 		case NC_NODE:
-			ED_area_tag_refresh(sa);
+			if (wmn->action == NA_EDITED)
+				ED_area_tag_refresh(sa);
 			break;
 	}
 }