[Bf-blender-cvs] [46d72e4] alembic_basic_io: Cleanup: curves.
Kévin Dietrich
noreply at git.blender.org
Thu Jun 30 01:20:06 CEST 2016
Commit: 46d72e425764ac4d70c80d926b3f61aa1a487b59
Author: Kévin Dietrich
Date: Thu Jun 30 01:16:14 2016 +0200
Branches: alembic_basic_io
https://developer.blender.org/rB46d72e425764ac4d70c80d926b3f61aa1a487b59
Cleanup: curves.
===================================================================
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 1295b7a..2906310 100644
--- a/source/blender/alembic/intern/abc_curves.cc
+++ b/source/blender/alembic/intern/abc_curves.cc
@@ -160,7 +160,9 @@ bool AbcCurveReader::valid() const
void AbcCurveReader::readObjectData(Main *bmain, Scene *scene, float time)
{
Curve *cu = BKE_curve_add(bmain, m_data_name.c_str(), OB_CURVE);
- cu->flag |= CU_PATH | CU_3D;
+
+ cu->flag |= CU_DEFORM_FILL;
+ cu->actvert = CU_ACT_NONE;
const ISampleSelector sample_sel(time);
@@ -183,6 +185,7 @@ void AbcCurveReader::readObjectData(Main *bmain, Scene *scene, float time)
nu->pntsu = steps;
nu->pntsv = 1;
nu->orderu = steps;
+ nu->flag |= CU_SMOOTH;
nu->flagu |= CU_NURB_ENDPOINT;
BPoint *bp = nu->bp;
@@ -198,12 +201,9 @@ void AbcCurveReader::readObjectData(Main *bmain, Scene *scene, float time)
BKE_nurb_knot_calc_u(nu);
- BLI_addtail(&cu->nurb, nu);
+ BLI_addtail(BKE_curve_nurbs_get(cu), nu);
}
- cu->actnu = CU_ACT_NONE;
- cu->actvert = CU_ACT_NONE;
-
if (m_settings->is_sequence || !m_curves_schema.isConstant()) {
addDefaultModifier(bmain);
}
More information about the Bf-blender-cvs
mailing list