[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53676] trunk/blender/source/blender: Fix #33796: Curve radius makes affect only in full fill mode

[Sergey Sharybin]

Revision: 53676
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53676
Author:   nazgul
Date:     2013-01-09 10:15:12 +0000 (Wed, 09 Jan 2013)
Log Message:
-----------
Fix #33796: Curve radius makes affect only in full fill mode

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_blender.h
    trunk/blender/source/blender/blenkernel/intern/displist.c
    trunk/blender/source/blender/blenloader/intern/readfile.c

Modified: trunk/blender/source/blender/blenkernel/BKE_blender.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_blender.h	2013-01-09 06:00:33 UTC (rev 53675)
+++ trunk/blender/source/blender/blenkernel/BKE_blender.h	2013-01-09 10:15:12 UTC (rev 53676)
@@ -42,7 +42,7 @@
  * and keep comment above the defines.
  * Use STRINGIFY() rather than defining with quotes */
 #define BLENDER_VERSION         265
-#define BLENDER_SUBVERSION      6
+#define BLENDER_SUBVERSION      7
 
 /* 262 was the last editmesh release but it has compatibility code for bmesh data */
 #define BLENDER_MINVERSION      262

Modified: trunk/blender/source/blender/blenkernel/intern/displist.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/displist.c	2013-01-09 06:00:33 UTC (rev 53675)
+++ trunk/blender/source/blender/blenkernel/intern/displist.c	2013-01-09 10:15:12 UTC (rev 53676)
@@ -1485,8 +1485,7 @@
 								float *cur_data = data;
 
 								if (cu->taperobj == NULL) {
-									if ( (cu->bevobj != NULL) || !((cu->flag & CU_FRONT) || (cu->flag & CU_BACK)) )
-										fac = bevp->radius;
+									fac = bevp->radius;
 								}
 								else {
 									float len, taper_fac;

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2013-01-09 06:00:33 UTC (rev 53675)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2013-01-09 10:15:12 UTC (rev 53676)
@@ -8612,6 +8612,39 @@
 		}
 	}
 
+	if (main->versionfile < 265 || (main->versionfile == 265 && main->subversionfile < 7)) {
+		Curve *cu;
+
+		for (cu = main->curve.first; cu; cu = cu->id.next) {
+			if (cu->flag & (CU_FRONT | CU_BACK)) {
+				Nurb *nu;
+
+				for (nu = cu->nurb.first; nu; nu = nu->next) {
+					int a;
+
+					if (nu->bezt) {
+						BezTriple *bezt = nu->bezt;
+						a = nu->pntsu;
+
+						while (a--) {
+							bezt->radius = 1.0f;
+							bezt++;
+						}
+					}
+					else if (nu->bp) {
+						BPoint *bp = nu->bp;
+						a = nu->pntsu * nu->pntsv;
+
+						while (a--) {
+							bp->radius = 1.0f;
+							bp++;
+						}
+					}
+				}
+			}
+		}
+	}
+
 	/* WATCH IT!!!: pointers from libdata have not been converted yet here! */
 	/* WATCH IT 2!: Userdef struct init has to be in editors/interface/resources.c! */