[Bf-blender-cvs] [6d0b380] alembic_basic_io: Ass some properties to the written hair samples.

[Kévin Dietrich]

Commit: 6d0b3804c28e393813645f7c6650c44688dc2d8e
Author: Kévin Dietrich
Date:   Tue May 31 01:44:34 2016 +0200
Branches: alembic_basic_io
https://developer.blender.org/rB6d0b3804c28e393813645f7c6650c44688dc2d8e

Ass some properties to the written hair samples.

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

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

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

diff --git a/source/blender/alembic/intern/abc_hair.cc 
b/source/blender/alembic/intern/abc_hair.cc
index d0ac2c9..c5b63ac 100644
--- a/source/blender/alembic/intern/abc_hair.cc
+++ b/source/blender/alembic/intern/abc_hair.cc
@@ -71,7 +71,7 @@ AbcHairWriter::AbcHairWriter(Scene *scene,
        m_psys = psys;
 
        OCurves curves(parent->alembicXform(), m_name, m_time_sampling);
-       m_curves_schema = curves.getSchema();
+       m_schema = curves.getSchema();
 }
 
 void AbcHairWriter::do_write()
@@ -108,22 +108,25 @@ void AbcHairWriter::do_write()
        dm->release(dm);
 
        Alembic::Abc::P3fArraySample iPos(verts);
-       m_curves_schema_sample = OCurvesSchema::Sample(iPos, hvertices);
+       m_sample = OCurvesSchema::Sample(iPos, hvertices);
+       m_sample.setBasis(Alembic::AbcGeom::kNoBasis);
+       m_sample.setType(Alembic::AbcGeom::kLinear);
+       m_sample.setWrap(Alembic::AbcGeom::kNonPeriodic);
 
        if (!uv_values.empty()) {
                OV2fGeomParam::Sample uv_smp;
                uv_smp.setVals(uv_values);
-               m_curves_schema_sample.setUVs(uv_smp);
+               m_sample.setUVs(uv_smp);
        }
 
        if (!norm_values.empty()) {
                ON3fGeomParam::Sample norm_smp;
                norm_smp.setVals(norm_values);
-               m_curves_schema_sample.setNormals(norm_smp);
+               m_sample.setNormals(norm_smp);
        }
 
-       m_curves_schema_sample.setSelfBounds(bounds());
-       m_curves_schema.set(m_curves_schema_sample);
+       m_sample.setSelfBounds(bounds());
+       m_schema.set(m_sample);
 }
 
 void AbcHairWriter::write_hair_sample(DerivedMesh *dm,
diff --git a/source/blender/alembic/intern/abc_hair.h 
b/source/blender/alembic/intern/abc_hair.h
index 1186072..c475e0d 100644
--- a/source/blender/alembic/intern/abc_hair.h
+++ b/source/blender/alembic/intern/abc_hair.h
@@ -35,8 +35,8 @@ struct ParticleSystem;
 class AbcHairWriter : public AbcShapeWriter {
     ParticleSystem *m_psys;
 
-       Alembic::AbcGeom::OCurvesSchema m_curves_schema;
-       Alembic::AbcGeom::OCurvesSchema::Sample m_curves_schema_sample;
+       Alembic::AbcGeom::OCurvesSchema m_schema;
+       Alembic::AbcGeom::OCurvesSchema::Sample m_sample;
 
 public:
        AbcHairWriter(Scene *scene,

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs