[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33503] branches/particles-2010/source/ blender/blenloader/intern: Fixed missing read/ write for new data node storage structs

Lukas Toenne lukas.toenne at googlemail.com
Mon Dec 6 11:36:20 CET 2010


Revision: 33503
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33503
Author:   lukastoenne
Date:     2010-12-06 11:36:19 +0100 (Mon, 06 Dec 2010)

Log Message:
-----------
Fixed missing read/write for new data node storage structs

Modified Paths:
--------------
    branches/particles-2010/source/blender/blenloader/intern/readfile.c
    branches/particles-2010/source/blender/blenloader/intern/writefile.c

Modified: branches/particles-2010/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/particles-2010/source/blender/blenloader/intern/readfile.c	2010-12-06 08:29:41 UTC (rev 33502)
+++ branches/particles-2010/source/blender/blenloader/intern/readfile.c	2010-12-06 10:36:19 UTC (rev 33503)
@@ -2119,7 +2119,16 @@
 				direct_link_curvemapping(fd, node->storage);
 			}
 			else if( ntree->type==NTREE_SIMULATION ) {
-				if( ELEM3(node->type, SIM_NODE_GETDATA, SIM_NODE_SETDATA, SIM_NODE_GETMESHDATA) )
+				if(node->type==SIM_NODE_GETDATA
+				   || node->type==SIM_NODE_SETDATA
+				   || node->type==SIM_NODE_GETMESHDATA
+				   || node->type==SIM_NODE_CREATEMESHPOINT
+				   || node->type==SIM_NODE_CURVE
+				   || node->type==SIM_NODE_FORGROUP
+				   || node->type==SIM_NODE_INDEX
+				   || node->type==SIM_NODE_ADDPARTICLE
+				   || node->type==SIM_NODE_PARTICLEDYNAMICS
+				   )
 					direct_link_sim_data_node(fd, ntree, node);
 			}
 		}

Modified: branches/particles-2010/source/blender/blenloader/intern/writefile.c
===================================================================
--- branches/particles-2010/source/blender/blenloader/intern/writefile.c	2010-12-06 08:29:41 UTC (rev 33502)
+++ branches/particles-2010/source/blender/blenloader/intern/writefile.c	2010-12-06 10:36:19 UTC (rev 33503)
@@ -497,7 +497,16 @@
 			else if(ntree->type==NTREE_TEXTURE && (node->type==TEX_NODE_CURVE_RGB || node->type==TEX_NODE_CURVE_TIME) )
 				write_curvemapping(wd, node->storage);
 			else if(ntree->type==NTREE_SIMULATION) {
-				if(ELEM3(node->type, SIM_NODE_GETDATA, SIM_NODE_SETDATA, SIM_NODE_GETMESHDATA))
+				if(node->type==SIM_NODE_GETDATA
+				   || node->type==SIM_NODE_SETDATA
+				   || node->type==SIM_NODE_GETMESHDATA
+				   || node->type==SIM_NODE_CREATEMESHPOINT
+				   || node->type==SIM_NODE_CURVE
+				   || node->type==SIM_NODE_FORGROUP
+				   || node->type==SIM_NODE_INDEX
+				   || node->type==SIM_NODE_ADDPARTICLE
+				   || node->type==SIM_NODE_PARTICLEDYNAMICS
+				   )
 					write_sim_data_node(wd, node->storage);
 				else
 					writestruct(wd, DATA, node->typeinfo->storagename, 1, node->storage);





More information about the Bf-blender-cvs mailing list