[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34336] trunk/blender/source/blender/ blenloader/intern/readfile.c: Bugfix:

Ton Roosendaal ton at blender.org
Sat Jan 15 19:00:47 CET 2011


Revision: 34336
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=34336
Author:   ton
Date:     2011-01-15 18:00:46 +0000 (Sat, 15 Jan 2011)
Log Message:
-----------
Bugfix:

Texture nodes, the Image node didn't get initialized on load.
This caused the node to refuse accepting a new Image if a
file couldn't be found on saving.

Modified Paths:
--------------
    trunk/blender/source/blender/blenloader/intern/readfile.c

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2011-01-15 16:14:57 UTC (rev 34335)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2011-01-15 18:00:46 UTC (rev 34336)
@@ -2104,8 +2104,11 @@
 				else if(ELEM3(node->type, CMP_NODE_IMAGE, CMP_NODE_VIEWER, CMP_NODE_SPLITVIEWER))
 					((ImageUser *)node->storage)->ok= 1;
 			}
-			else if( ntree->type==NTREE_TEXTURE && (node->type==TEX_NODE_CURVE_RGB || node->type==TEX_NODE_CURVE_TIME) ) {
-				direct_link_curvemapping(fd, node->storage);
+			else if( ntree->type==NTREE_TEXTURE) {
+				if(node->type==TEX_NODE_CURVE_RGB || node->type==TEX_NODE_CURVE_TIME)
+					direct_link_curvemapping(fd, node->storage);
+				else if(node->type==TEX_NODE_IMAGE)
+					((ImageUser *)node->storage)->ok= 1;
 			}
 		}
 		link_list(fd, &node->inputs);




More information about the Bf-blender-cvs mailing list