[Bf-blender-cvs] [307fa8f] alembic_basic_io: Cleanup: includes, `using` statements.

[Kévin Dietrich]

Commit: 307fa8f8ec1dbcd1a64752c07564473575ff4dec
Author: Kévin Dietrich
Date:   Thu Jun 9 09:55:36 2016 +0200
Branches: alembic_basic_io
https://developer.blender.org/rB307fa8f8ec1dbcd1a64752c07564473575ff4dec

Cleanup: includes, `using` statements.

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

M	source/blender/alembic/intern/abc_object.cc
M	source/blender/alembic/intern/abc_points.cc
M	source/blender/alembic/intern/abc_util.h
M	source/blender/alembic/intern/alembic_capi.cc

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

diff --git a/source/blender/alembic/intern/abc_object.cc b/source/blender/alembic/intern/abc_object.cc
index 0fd374d..84da55a 100644
--- a/source/blender/alembic/intern/abc_object.cc
+++ b/source/blender/alembic/intern/abc_object.cc
@@ -22,8 +22,6 @@
 
 #include "abc_object.h"
 
-#include <Alembic/AbcGeom/All.h>
-
 #include "abc_util.h"
 
 extern "C" {
diff --git a/source/blender/alembic/intern/abc_points.cc b/source/blender/alembic/intern/abc_points.cc
index fc016ef..3760376 100644
--- a/source/blender/alembic/intern/abc_points.cc
+++ b/source/blender/alembic/intern/abc_points.cc
@@ -24,8 +24,6 @@
 
 #include "abc_points.h"
 
-#include <Alembic/Abc/All.h>
-
 #include "abc_mesh.h"
 #include "abc_transform.h"
 #include "abc_util.h"
diff --git a/source/blender/alembic/intern/abc_util.h b/source/blender/alembic/intern/abc_util.h
index 2b24724..89a07a3 100644
--- a/source/blender/alembic/intern/abc_util.h
+++ b/source/blender/alembic/intern/abc_util.h
@@ -25,6 +25,8 @@
 #include <Alembic/Abc/All.h>
 #include <Alembic/AbcGeom/All.h>
 
+using Alembic::Abc::chrono_t;
+
 struct ID;
 struct Object;
 
@@ -54,14 +56,10 @@ void create_input_transform(const Alembic::AbcGeom::ISampleSelector &sample_sel,
                             const Alembic::AbcGeom::IXform &ixform, Object *ob,
                             float r_mat[4][4], float scale);
 
-using Alembic::Abc::chrono_t;
-
 template <typename Schema>
 void get_min_max_time(const Schema &schema, chrono_t &min, chrono_t &max)
 {
-	using Alembic::Abc::TimeSamplingPtr;
-
-	TimeSamplingPtr time_samp = schema.getTimeSampling();
+	const Alembic::Abc::TimeSamplingPtr &time_samp = schema.getTimeSampling();
 
 	if (!schema.isConstant()) {
 		const size_t num_samps = schema.getNumSamples();
diff --git a/source/blender/alembic/intern/alembic_capi.cc b/source/blender/alembic/intern/alembic_capi.cc
index aaf9143..9e1d52e 100644
--- a/source/blender/alembic/intern/alembic_capi.cc
+++ b/source/blender/alembic/intern/alembic_capi.cc
@@ -62,6 +62,8 @@ extern "C" {
 #include "WM_types.h"
 }
 
+using Alembic::Abc::ObjectHeader;
+
 using Alembic::AbcGeom::ErrorHandler;
 using Alembic::AbcGeom::Exception;
 using Alembic::AbcGeom::MetaData;
@@ -71,11 +73,13 @@ using Alembic::AbcGeom::kWrapExisting;
 using Alembic::AbcGeom::IArchive;
 using Alembic::AbcGeom::ICamera;
 using Alembic::AbcGeom::ICurves;
+using Alembic::AbcGeom::ICurvesSchema;
 using Alembic::AbcGeom::IFaceSet;
 using Alembic::AbcGeom::ILight;
 using Alembic::AbcGeom::INuPatch;
 using Alembic::AbcGeom::IObject;
 using Alembic::AbcGeom::IPoints;
+using Alembic::AbcGeom::IPointsSchema;
 using Alembic::AbcGeom::IPolyMesh;
 using Alembic::AbcGeom::IPolyMeshSchema;
 using Alembic::AbcGeom::ISampleSelector;
@@ -696,10 +700,6 @@ static DerivedMesh *read_mesh_sample(DerivedMesh *dm, const IObject &iobject, co
 	return dm;
 }
 
-using Alembic::Abc::ObjectHeader;
-using Alembic::AbcGeom::IPointsSchema;
-using Alembic::AbcGeom::ICurvesSchema;
-
 static DerivedMesh *read_points_sample(DerivedMesh *dm, const IObject &iobject, const float time)
 {
 	IPoints points(iobject, kWrapExisting);
@@ -755,7 +755,7 @@ DerivedMesh *ABC_read_mesh(DerivedMesh *dm, const char *filepath, const char *ob
 		return NULL;
 	}
 
-	const Alembic::Abc::ObjectHeader &header = iobject.getHeader();
+	const ObjectHeader &header = iobject.getHeader();
 
 	if (IPolyMesh::matches(header)) {
 		return read_mesh_sample(dm, iobject, time);
@@ -783,7 +783,7 @@ void ABC_read_vertex_cache(const char *filepath, const char *object_path, const
 		return;
 	}
 
-	const Alembic::Abc::ObjectHeader &header = iobject.getHeader();
+	const ObjectHeader &header = iobject.getHeader();
 
 	if (ICurves::matches(header)) {
 		return read_curves_sample(vertexCos, max_verts, iobject, time);