Commit: d0489cae6922c9bf57db933f8532760d1c90a101
Author: Kévin Dietrich
Date: Thu May 26 22:00:15 2016 +0200
Branches: alembic_basic_io
https://developer.blender.org/rBd0489cae6922c9bf57db933f8532760d1c90a101
Fix curve using editnurbs in object mode.
===================================================================
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 acaa21a..7ef7b3e 100644
--- a/source/blender/alembic/intern/abc_hair.cc
+++ b/source/blender/alembic/intern/abc_hair.cc
@@ -313,7 +313,6 @@ bool AbcHairReader::valid() const
void AbcHairReader::readObjectData(Main *bmain, Scene *scene, float time)
{
Curve *cu = BKE_curve_add(bmain, "abc_hair", OB_CURVE);
- cu->editnurb = (EditNurb *)MEM_callocN(sizeof(EditNurb), "editnurb");
cu->flag |= CU_DEFORM_FILL | CU_PATH | CU_3D;
const ISampleSelector sample_sel(time);
@@ -325,8 +324,6 @@ void AbcHairReader::readObjectData(Main *bmain, Scene
*scene, float time)
m_object = BKE_object_add(bmain, scene, OB_CURVE,
m_object_name.c_str());
m_object->data = cu;
- ListBase *editnurb = object_editcurve_get(m_object);
-
size_t idx = 0;
for (size_t i = 0; i < hvertices->size(); ++i) {
const int steps = (*hvertices)[i];
@@ -352,7 +349,6 @@ void AbcHairReader::readObjectData(Main *bmain, Scene
*scene, float time)
bp->vec[2] = pos.y;
bp->vec[3] = 1.0;
- // bp->f1 = SELECT;
bp->radius = bp->weight = 1.0;
}
@@ -361,7 +357,7 @@ void AbcHairReader::readObjectData(Main *bmain, Scene
*scene, float time)
nu->flag |= CU_SMOOTH;
- BLI_addtail(editnurb, nu);
+ BLI_addtail(&cu->nurb, nu);
}
cu->actnu = hvertices->size() - 1;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
