Two additional fixes for node-tree + texture paint:

- "need exec" flag was cleared in wrong tree for preview renders
  (it should clear it in the copy, i did in original).
  This fixes projection paint on images with previews open
- Previews for nodes were copied always, now only for previews 
  invoked by node editor itself.

1 files changed, 14 insertions, 13 deletions

diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c
index 1a454341f01..33f81bb7d16 100644
--- a/source/blender/editors/render/render_preview.c
+++ b/source/blender/editors/render/render_preview.c
@@ -983,19 +983,20 @@ static void shader_preview_updatejob(void *spv)
 	ShaderPreview *sp= spv;
 	
 	if(sp->id) {
-		if( GS(sp->id->name) == ID_MA) {
-			Material *mat= (Material *)sp->id;
-			
-			if(sp->matcopy && mat->nodetree && sp->matcopy->nodetree)
-				ntreeLocalSync(sp->matcopy->nodetree, mat->nodetree);
-		}
-		else if( GS(sp->id->name) == ID_TE) {
-			Tex *tex= (Tex *)sp->id;
-			
-			if(sp->texcopy && tex->nodetree && sp->texcopy->nodetree)
-				ntreeLocalSync(sp->texcopy->nodetree, tex->nodetree);
-		}
-		
+		if(sp->pr_method==PR_NODE_RENDER) {
+			if( GS(sp->id->name) == ID_MA) {
+				Material *mat= (Material *)sp->id;
+				
+				if(sp->matcopy && mat->nodetree && sp->matcopy->nodetree)
+					ntreeLocalSync(sp->matcopy->nodetree, mat->nodetree);
+			}
+			else if( GS(sp->id->name) == ID_TE) {
+				Tex *tex= (Tex *)sp->id;
+				
+				if(sp->texcopy && tex->nodetree && sp->texcopy->nodetree)
+					ntreeLocalSync(sp->texcopy->nodetree, tex->nodetree);
+			}
+		}		
 	}
 }