[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20236] trunk/blender/source/blender/src/ editnode.c: Bugfix #18756

Ton Roosendaal ton at blender.org
Sun May 17 11:56:51 CEST 2009


Revision: 20236
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20236
Author:   ton
Date:     2009-05-17 11:56:48 +0200 (Sun, 17 May 2009)

Log Message:
-----------
Bugfix #18756

Texture nodes: on file load, the preview render signal was ignored.
Found out it ignores it all the way, inserting refreshes all over, not
using the 'afterqueue'. Will live with that for now, in 2.5 it's nicer
supported anyway.

Just added another refresh line on the proper signal to make it look nice
on file loads.

Modified Paths:
--------------
    trunk/blender/source/blender/src/editnode.c

Modified: trunk/blender/source/blender/src/editnode.c
===================================================================
--- trunk/blender/source/blender/src/editnode.c	2009-05-17 09:25:30 UTC (rev 20235)
+++ trunk/blender/source/blender/src/editnode.c	2009-05-17 09:56:48 UTC (rev 20236)
@@ -180,7 +180,7 @@
 		allqueue(REDRAWNODE, 1);
 	}
 	else if(snode->treetype==NTREE_TEXTURE) {
-		ntreeTexUpdatePreviews(snode->nodetree);
+		ntreeTexUpdatePreviews(snode->nodetree);/* XXX texture nodes should follow shader node methods (ton) */
 		BIF_preview_changed(ID_TE);
 	}
 }
@@ -550,7 +550,7 @@
 	nodeAddLink(tx->nodetree, in, fromsock, out, tosock);
 	
 	ntreeSolveOrder(tx->nodetree);	/* needed for pointers */
-	ntreeTexUpdatePreviews(tx->nodetree);
+	ntreeTexUpdatePreviews(tx->nodetree);/* XXX texture nodes should follow shader node methods (ton) */
 }
 
 /* Here we set the active tree(s), even called for each redraw now, so keep it fast :) */
@@ -1301,7 +1301,7 @@
 	allqueue(REDRAWNODE, 1);
 	
 	if(snode->nodetree->type == NTREE_TEXTURE)
-		ntreeTexUpdatePreviews(snode->nodetree);
+		ntreeTexUpdatePreviews(snode->nodetree);/* XXX texture nodes should follow shader node methods (ton) */
 }
 
 /* ******************** rename ******************* */
@@ -1819,7 +1819,7 @@
 	
 	if(snode->nodetree->type==NTREE_TEXTURE) {
 		ntreeTexCheckCyclics(snode->edittree);
-		ntreeTexUpdatePreviews(snode->edittree);
+		ntreeTexUpdatePreviews(snode->edittree);/* XXX texture nodes should follow shader node methods (ton) */
 	}
 	
 	return node;
@@ -2608,6 +2608,9 @@
 		case RENDERPREVIEW:
 			if(snode->treetype==NTREE_SHADER)
 				shader_node_previewrender(sa, snode);
+			else if(snode->nodetree->type==NTREE_TEXTURE)
+				ntreeTexUpdatePreviews(snode->edittree); /* XXX texture nodes should follow shader node methods (ton) */
+				
 			break;
 			
 		case PADPLUSKEY:





More information about the Bf-blender-cvs mailing list