[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53714] trunk/blender/source/blender/ blenloader/intern/readfile.c: Correction to do_versions() in 53676

Sergey Sharybin sergey.vfx at gmail.com
Thu Jan 10 19:11:57 CET 2013


Revision: 53714
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53714
Author:   nazgul
Date:     2013-01-10 18:11:56 +0000 (Thu, 10 Jan 2013)
Log Message:
-----------
Correction to do_versions() in 53676

Affect on curve radius only if offset/extrude was used,
otherwise radius could have been used for other things
(like controlling hair) which will likely break
compatibility.

Reported by Tube project guys.

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	2013-01-10 17:46:23 UTC (rev 53713)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2013-01-10 18:11:56 UTC (rev 53714)
@@ -8617,27 +8617,29 @@
 
 		for (cu = main->curve.first; cu; cu = cu->id.next) {
 			if (cu->flag & (CU_FRONT | CU_BACK)) {
-				Nurb *nu;
+				if ( cu->ext1 != 0.0f || cu->ext2 != 0.0f) {
+					Nurb *nu;
 
-				for (nu = cu->nurb.first; nu; nu = nu->next) {
-					int a;
+					for (nu = cu->nurb.first; nu; nu = nu->next) {
+						int a;
 
-					if (nu->bezt) {
-						BezTriple *bezt = nu->bezt;
-						a = nu->pntsu;
+						if (nu->bezt) {
+							BezTriple *bezt = nu->bezt;
+							a = nu->pntsu;
 
-						while (a--) {
-							bezt->radius = 1.0f;
-							bezt++;
+							while (a--) {
+								bezt->radius = 1.0f;
+								bezt++;
+							}
 						}
-					}
-					else if (nu->bp) {
-						BPoint *bp = nu->bp;
-						a = nu->pntsu * nu->pntsv;
+						else if (nu->bp) {
+							BPoint *bp = nu->bp;
+							a = nu->pntsu * nu->pntsv;
 
-						while (a--) {
-							bp->radius = 1.0f;
-							bp++;
+							while (a--) {
+								bp->radius = 1.0f;
+								bp++;
+							}
 						}
 					}
 				}




More information about the Bf-blender-cvs mailing list