[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32190] trunk/blender/source/blender/ blenloader/intern/readfile.c: own changes in recent commit broke curve loading because the curve type checking function looked in the curves listbase .

[Campbell Barton]

Revision: 32190
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32190
Author:   campbellbarton
Date:     2010-09-29 14:46:26 +0200 (Wed, 29 Sep 2010)

Log Message:
-----------
own changes in recent commit broke curve loading because the curve type checking function looked in the curves listbase.

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	2010-09-29 12:34:32 UTC (rev 32189)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2010-09-29 12:46:26 UTC (rev 32190)
@@ -2735,7 +2735,7 @@
 	cu->strinfo= newdataadr(fd, cu->strinfo);	
 	cu->tb= newdataadr(fd, cu->tb);
 
-	if(curve_type(cu) != OB_FONT) link_list(fd, &(cu->nurb));
+	if(cu->vfont == NULL) link_list(fd, &(cu->nurb));
 	else {
 		cu->nurb.first=cu->nurb.last= 0;
 
@@ -2766,7 +2766,7 @@
 		nu->bp= newdataadr(fd, nu->bp);
 		nu->knotsu= newdataadr(fd, nu->knotsu);
 		nu->knotsv= newdataadr(fd, nu->knotsv);
-		if (curve_type(cu) != OB_FONT) nu->charidx= nu->mat_nr;
+		if (cu->vfont == NULL) nu->charidx= nu->mat_nr;
 
 		if(fd->flags & FD_FLAGS_SWITCH_ENDIAN) {
 			switch_endian_knots(nu);