[Bf-blender-cvs] [e01444b] alembic_basic_io: Make use of the SubD reader.

[Kévin Dietrich]

Commit: e01444bd358833c287cf7a1a008ed3fcdc316a60
Author: Kévin Dietrich
Date:   Wed Jul 20 14:37:13 2016 +0200
Branches: alembic_basic_io
https://developer.blender.org/rBe01444bd358833c287cf7a1a008ed3fcdc316a60

Make use of the SubD reader.

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

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

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

diff --git a/source/blender/alembic/intern/abc_mesh.cc b/source/blender/alembic/intern/abc_mesh.cc
index 405fc33..2ef20f4 100644
--- a/source/blender/alembic/intern/abc_mesh.cc
+++ b/source/blender/alembic/intern/abc_mesh.cc
@@ -966,7 +966,7 @@ ABC_INLINE void read_normals_params(AbcMeshData &abc_data,
 
 /* ************************************************************************** */
 
-AbcMeshReader::AbcMeshReader(const IObject &object, ImportSettings &settings, bool is_subd)
+AbcMeshReader::AbcMeshReader(const IObject &object, ImportSettings &settings)
     : AbcObjectReader(object, settings)
 {
 	m_settings->flag |= ABC_READ_ALL;
diff --git a/source/blender/alembic/intern/abc_mesh.h b/source/blender/alembic/intern/abc_mesh.h
index eb5e1f0..4219f75 100644
--- a/source/blender/alembic/intern/abc_mesh.h
+++ b/source/blender/alembic/intern/abc_mesh.h
@@ -97,7 +97,7 @@ class AbcMeshReader : public AbcObjectReader {
 	CDStreamConfig m_mesh_data;
 
 public:
-	AbcMeshReader(const Alembic::Abc::IObject &object, ImportSettings &settings, bool is_subd);
+	AbcMeshReader(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 b8737ca..7ff0321 100644
--- a/source/blender/alembic/intern/alembic_capi.cc
+++ b/source/blender/alembic/intern/alembic_capi.cc
@@ -475,10 +475,10 @@ static void visit_object(const IObject &object,
 			}
 		}
 		else if (IPolyMesh::matches(md)) {
-			reader = new AbcMeshReader(child, settings, false);
+			reader = new AbcMeshReader(child, settings);
 		}
 		else if (ISubD::matches(md)) {
-			reader = new AbcMeshReader(child, settings, true);
+			reader = new AbcSubDReader(child, settings);
 		}
 		else if (INuPatch::matches(md)) {
 			reader = new AbcNurbsReader(child, settings);