[Bf-blender-cvs] [63c1a30] alembic_basic_io: Don't call BKE_nurb_knot_calc_u on curve paths.

Kévin Dietrich noreply at git.blender.org
Wed Jun 15 17:02:57 CEST 2016


Commit: 63c1a30e982123758d454e58e85bc8957c7158c0
Author: Kévin Dietrich
Date:   Wed Jun 15 12:57:36 2016 +0200
Branches: alembic_basic_io
https://developer.blender.org/rB63c1a30e982123758d454e58e85bc8957c7158c0

Don't call BKE_nurb_knot_calc_u on curve paths.

===================================================================

M	source/blender/alembic/intern/abc_hair.cc

===================================================================

diff --git a/source/blender/alembic/intern/abc_hair.cc b/source/blender/alembic/intern/abc_hair.cc
index a4cdb79..38d6c54 100644
--- a/source/blender/alembic/intern/abc_hair.cc
+++ b/source/blender/alembic/intern/abc_hair.cc
@@ -316,7 +316,7 @@ bool AbcHairReader::valid() const
 void AbcHairReader::readObjectData(Main *bmain, Scene *scene, float time)
 {
 	Curve *cu = BKE_curve_add(bmain, m_data_name.c_str(), OB_CURVE);
-	cu->flag |= CU_DEFORM_FILL | CU_PATH | CU_3D;
+	cu->flag |= CU_PATH | CU_3D;
 
 	const ISampleSelector sample_sel(time);
 
@@ -339,7 +339,8 @@ void AbcHairReader::readObjectData(Main *bmain, Scene *scene, float time)
 		nu->pntsu = steps;
 		nu->pntsv = 1;
 		nu->orderu = steps;
-		nu->flagu = CU_NURB_ENDPOINT; /* endpoint */
+		nu->flagu = CU_NURB_ENDPOINT;
+		nu->flagv = CU_NURB_ENDPOINT;
 
 		BPoint *bp = nu->bp;
 
@@ -352,9 +353,6 @@ void AbcHairReader::readObjectData(Main *bmain, Scene *scene, float time)
 			bp->radius = bp->weight = 1.0;
 		}
 
-		nu->knotsu = NULL; /* nurbs_knot_calc_u allocates */
-		BKE_nurb_knot_calc_u(nu);
-
 		nu->flag |= CU_SMOOTH;
 
 		BLI_addtail(&cu->nurb, nu);




More information about the Bf-blender-cvs mailing list