[Bf-blender-cvs] [cefbbb9a] alembic_basic_io: Make sure curve knots are computed.

Kévin Dietrich noreply at git.blender.org
Mon Jun 27 19:05:14 CEST 2016


Commit: cefbbb9af45dc1adc99f86578e9a97175548d1e4
Author: Kévin Dietrich
Date:   Mon Jun 27 00:43:12 2016 +0200
Branches: alembic_basic_io
https://developer.blender.org/rBcefbbb9af45dc1adc99f86578e9a97175548d1e4

Make sure curve knots are computed.

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

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

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

diff --git a/source/blender/alembic/intern/abc_curves.cc b/source/blender/alembic/intern/abc_curves.cc
index 09b75ed..1295b7a 100644
--- a/source/blender/alembic/intern/abc_curves.cc
+++ b/source/blender/alembic/intern/abc_curves.cc
@@ -183,8 +183,7 @@ void AbcCurveReader::readObjectData(Main *bmain, Scene *scene, float time)
 		nu->pntsu = steps;
 		nu->pntsv = 1;
 		nu->orderu = steps;
-		nu->flagu = CU_NURB_ENDPOINT;
-		nu->flagv = CU_NURB_ENDPOINT;
+		nu->flagu |= CU_NURB_ENDPOINT;
 
 		BPoint *bp = nu->bp;
 
@@ -192,17 +191,17 @@ void AbcCurveReader::readObjectData(Main *bmain, Scene *scene, float time)
 			Imath::V3f pos = (*positions)[idx++];
 
 			copy_yup_zup(bp->vec, pos.getValue());
-			bp->vec[3] = 1.0;
+			bp->vec[3] = 1.0f;
 
-			bp->radius = bp->weight = 1.0;
+			bp->radius = bp->weight = 1.0f;
 		}
 
-		nu->flag |= CU_SMOOTH;
+		BKE_nurb_knot_calc_u(nu);
 
 		BLI_addtail(&cu->nurb, nu);
 	}
 
-	cu->actnu = hvertices->size();
+	cu->actnu = CU_ACT_NONE;
 	cu->actvert = CU_ACT_NONE;
 
 	if (m_settings->is_sequence || !m_curves_schema.isConstant()) {




More information about the Bf-blender-cvs mailing list