[Bf-blender-cvs] [d36af60] alembic_basic_io: Rename AbcHairReader -> AbcCurveReader.

[Kévin Dietrich]

Commit: d36af600b2af8eb03058c3caf850b723046504b9
Author: Kévin Dietrich
Date:   Wed Jun 15 13:00:15 2016 +0200
Branches: alembic_basic_io
https://developer.blender.org/rBd36af600b2af8eb03058c3caf850b723046504b9

Rename AbcHairReader -> AbcCurveReader.

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

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

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

diff --git a/source/blender/alembic/intern/abc_hair.cc 
b/source/blender/alembic/intern/abc_hair.cc
index 38d6c54..33f7dce 100644
--- a/source/blender/alembic/intern/abc_hair.cc
+++ b/source/blender/alembic/intern/abc_hair.cc
@@ -299,7 +299,7 @@ void AbcHairWriter::write_hair_child_sample(DerivedMesh *dm,
 
 /* ************************************************************************** 
*/
 
-AbcHairReader::AbcHairReader(const Alembic::Abc::IObject &object, 
ImportSettings &settings)
+AbcCurveReader::AbcCurveReader(const Alembic::Abc::IObject &object, 
ImportSettings &settings)
     : AbcObjectReader(object, settings)
 {
        ICurves abc_curves(object, kWrapExisting);
@@ -308,12 +308,12 @@ AbcHairReader::AbcHairReader(const Alembic::Abc::IObject 
&object, ImportSettings
        get_min_max_time(m_curves_schema, m_min_time, m_max_time);
 }
 
-bool AbcHairReader::valid() const
+bool AbcCurveReader::valid() const
 {
        return m_curves_schema.valid();
 }
 
-void AbcHairReader::readObjectData(Main *bmain, Scene *scene, float time)
+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;
diff --git a/source/blender/alembic/intern/abc_hair.h 
b/source/blender/alembic/intern/abc_hair.h
index f613d03..8fb0ee5 100644
--- a/source/blender/alembic/intern/abc_hair.h
+++ b/source/blender/alembic/intern/abc_hair.h
@@ -64,11 +64,11 @@ private:
 
 /* ************************************************************************** 
*/
 
-class AbcHairReader : public AbcObjectReader {
+class AbcCurveReader : public AbcObjectReader {
        Alembic::AbcGeom::ICurvesSchema m_curves_schema;
 
 public:
-       AbcHairReader(const Alembic::Abc::IObject &object, ImportSettings 
&settings);
+       AbcCurveReader(const Alembic::Abc::IObject &object, ImportSettings 
&settings);
 
        bool valid() const;
 
diff --git a/source/blender/alembic/intern/alembic_capi.cc 
b/source/blender/alembic/intern/alembic_capi.cc
index fe7878e..757daa0 100644
--- a/source/blender/alembic/intern/alembic_capi.cc
+++ b/source/blender/alembic/intern/alembic_capi.cc
@@ -444,7 +444,7 @@ static void visit_object(const IObject &object,
                        /* Pass, those are handled in the mesh reader. */
                }
                else if (ICurves::matches(md)) {
-                       reader = new AbcHairReader(child, settings);
+                       reader = new AbcCurveReader(child, settings);
                }
                else {
                        assert(false);

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