[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35350] trunk/blender/source/blender: Two additional fixes for node-tree + texture paint:

[Ton Roosendaal]

Revision: 35350
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35350
Author:   ton
Date:     2011-03-04 12:59:09 +0000 (Fri, 04 Mar 2011)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/node.c
    trunk/blender/source/blender/editors/render/render_preview.c

Modified: trunk/blender/source/blender/blenkernel/intern/node.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/node.c       2011-03-04 
11:08:22 UTC (rev 35349)
+++ trunk/blender/source/blender/blenkernel/intern/node.c       2011-03-04 
12:59:09 UTC (rev 35350)
@@ -2815,14 +2815,14 @@
        /* end animdata uglyness */
 
        /* ensures only a single output node is enabled */
-       ntreeSetOutput(ntree);
+       ntreeSetOutput(ltree);
 
        for(node= ntree->nodes.first; node; node= node->next) {
                
                /* store new_node pointer to original */
                node->new_node->new_node= node;
                /* ensure new user input gets handled ok */
-               node->need_exec= 0;
+               node->new_node->need_exec= 0;
                
                if(ntree->type==NTREE_COMPOSIT) {
                        /* move over the compbufs */

Modified: trunk/blender/source/blender/editors/render/render_preview.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_preview.c        
2011-03-04 11:08:22 UTC (rev 35349)
+++ trunk/blender/source/blender/editors/render/render_preview.c        
2011-03-04 12:59:09 UTC (rev 35350)
@@ -983,19 +983,20 @@
        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);
+                       }
+               }               
        }
 }
 

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs