[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22617] branches/blender2.5/blender/source /blender: Texture node previews: Well and truly fixed.

[Robin Allen]

Revision: 22617
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22617
Author:   kakbarnf
Date:     2009-08-19 02:46:06 +0200 (Wed, 19 Aug 2009)

Log Message:
-----------
Texture node previews: Well and truly fixed.

(Probably.)

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/space_node/node_draw.c
    branches/blender2.5/blender/source/blender/editors/space_node/space_node.c
    branches/blender2.5/blender/source/blender/nodes/intern/TEX_util.c

Modified: 
branches/blender2.5/blender/source/blender/editors/space_node/node_draw.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_node/node_draw.c   
2009-08-18 21:19:29 UTC (rev 22616)
+++ branches/blender2.5/blender/source/blender/editors/space_node/node_draw.c   
2009-08-19 00:46:06 UTC (rev 22617)
@@ -609,7 +609,6 @@
                }                       
                else if(snode->treetype==NTREE_TEXTURE) {
                        WM_event_add_notifier(C, NC_TEXTURE|ND_NODES, 
snode->id);
-                       ntreeTexUpdatePreviews(snode->nodetree);
                }
        }
        

Modified: 
branches/blender2.5/blender/source/blender/editors/space_node/space_node.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_node/space_node.c  
2009-08-18 21:19:29 UTC (rev 22616)
+++ branches/blender2.5/blender/source/blender/editors/space_node/space_node.c  
2009-08-19 00:46:06 UTC (rev 22617)
@@ -46,6 +46,7 @@
 #include "BKE_colortools.h"
 #include "BKE_context.h"
 #include "BKE_screen.h"
+#include "BKE_node.h"
 
 #include "ED_previewrender.h"
 #include "ED_space_api.h"
@@ -181,6 +182,11 @@
                        if(scene->use_nodes)
                                snode_composite_job(C, sa);
                }
+               else if(snode->treetype==NTREE_TEXTURE) {
+                       Tex *tex= (Tex *)snode->id;
+                       if(tex->use_nodes)
+                               ntreeTexUpdatePreviews(tex->nodetree);
+               }
        }
 }
 

Modified: branches/blender2.5/blender/source/blender/nodes/intern/TEX_util.c
===================================================================
--- branches/blender2.5/blender/source/blender/nodes/intern/TEX_util.c  
2009-08-18 21:19:29 UTC (rev 22616)
+++ branches/blender2.5/blender/source/blender/nodes/intern/TEX_util.c  
2009-08-19 00:46:06 UTC (rev 22617)
@@ -246,14 +246,12 @@
        
        for(tex= G.main->tex.first; tex; tex= tex->id.next)
                if(tex->nodetree == nodetree) break;
-       if(!tex) return;
+       if(tex) {
+               dummy_texres.nor = 0;
        
-       dummy_texres.nor = 0;
-       
-       ntreeBeginExecTree(nodetree);
-       ntreeTexExecTree(nodetree, &dummy_texres, coord, 0, 0, 1, 0, tex, 0, 0);
-       ntreeEndExecTree(nodetree);
-       
+               ntreeBeginExecTree(nodetree);
+               ntreeTexExecTree(nodetree, &dummy_texres, coord, 0, 0, 1, 0, 
tex, 0, 0);
+       }
 }
 
 char* ntreeTexOutputMenu(bNodeTree *ntree)


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