[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31062] trunk/blender/source/blender/ blenkernel/intern: Do not reset bevel/taper object when they' ve got incorrect type - just do

[Sergey Sharybin]

Revision: 31062
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31062
Author:   nazgul
Date:     2010-08-05 10:39:25 +0200 (Thu, 05 Aug 2010)

Log Message:
-----------
Do not reset bevel/taper object when they've got incorrect type - just do
noting in makebevelcurve and calc_taper functions if type is not curve.

This avoids DNA changing depended on object recalc.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/curve.c
    trunk/blender/source/blender/blenkernel/intern/displist.c

Modified: trunk/blender/source/blender/blenkernel/intern/curve.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/curve.c	2010-08-05 08:23:26 UTC (rev 31061)
+++ trunk/blender/source/blender/blenkernel/intern/curve.c	2010-08-05 08:39:25 UTC (rev 31062)
@@ -1222,6 +1222,8 @@
 // XXX	if( ob == obedit && ob->type == OB_FONT ) return;
 
 	if(cu->bevobj) {
+		if (cu->bevobj->type!=OB_CURVE) return;
+
 		bevcu= cu->bevobj->data;
 		if(bevcu->ext1==0.0 && bevcu->ext2==0.0) {
 			ListBase bevdisp= {NULL, NULL};

Modified: trunk/blender/source/blender/blenkernel/intern/displist.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/displist.c	2010-08-05 08:23:26 UTC (rev 31061)
+++ trunk/blender/source/blender/blenkernel/intern/displist.c	2010-08-05 08:39:25 UTC (rev 31062)
@@ -1129,7 +1129,7 @@
 	Curve *cu;
 	DispList *dl;
 	
-	if(taperobj==NULL) return 1.0;
+	if(taperobj==NULL || taperobj->type!=OB_CURVE) return 1.0;
 	
 	cu= taperobj->data;
 	dl= cu->disp.first;
@@ -1682,15 +1682,6 @@
 		float (*deformedVerts)[3];
 		int numVerts;
 
-		/* Bevel and taper objects should always be curves */
-		if (cu->bevobj && cu->bevobj->type != OB_CURVE) {
-			cu->bevobj = NULL;
-		}
-
-		if (cu->taperobj && cu->taperobj->type != OB_CURVE) {
-			cu->taperobj = NULL;
-		}
-
 		nubase= BKE_curve_nurbs(cu);
 
 		BLI_freelistN(&(cu->bev));