[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28847] branches/soc-2010-moguri/source/ blender/blenloader/intern/readfile.c: readfile.c fixes that Dalai suggested .

[Mitchell Stokes]

Revision: 28847
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28847
Author:   moguri
Date:     2010-05-19 07:39:42 +0200 (Wed, 19 May 2010)

Log Message:
-----------
readfile.c fixes that Dalai suggested.

Modified Paths:
--------------
    branches/soc-2010-moguri/source/blender/blenloader/intern/readfile.c

Modified: branches/soc-2010-moguri/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/soc-2010-moguri/source/blender/blenloader/intern/readfile.c	2010-05-19 02:03:29 UTC (rev 28846)
+++ branches/soc-2010-moguri/source/blender/blenloader/intern/readfile.c	2010-05-19 05:39:42 UTC (rev 28847)
@@ -2903,9 +2903,9 @@
 	ma->ramp_col= newdataadr(fd, ma->ramp_col);
 	ma->ramp_spec= newdataadr(fd, ma->ramp_spec);
 
-	ma->vert_text= newlibadr_us(fd, ma->id.lib, ma->vert_text);
-	ma->frag_text= newlibadr_us(fd, ma->id.lib, ma->frag_text);
-	ma->geom_text= newlibadr_us(fd, ma->id.lib, ma->geom_text);
+	ma->vert_text= newlibadr(fd, ma->id.lib, ma->vert_text);
+	ma->frag_text= newlibadr(fd, ma->id.lib, ma->frag_text);
+	ma->geom_text= newlibadr(fd, ma->id.lib, ma->geom_text);
 	
 	ma->nodetree= newdataadr(fd, ma->nodetree);
 	if(ma->nodetree)
@@ -11388,6 +11388,10 @@
 	}
 	
 	expand_doit(fd, mainvar, ma->ipo); // XXX depreceated - old animation system
+
+	expand_doit(fd, mainvar, ma->vert_text);
+	expand_doit(fd, mainvar, ma->frag_text);
+	expand_doit(fd, mainvar, ma->geom_text);
 	
 	if(ma->adt)
 		expand_animdata(fd, mainvar, ma->adt);