[Bf-blender-cvs] [39cbe8d7155] cycles_procedural_api: fix compile error due to identifier collision

[Kévin Dietrich]

Commit: 39cbe8d715598942dbf110b5295972f8036b652f
Author: Kévin Dietrich
Date:   Thu Nov 5 10:07:12 2020 +0100
Branches: cycles_procedural_api
https://developer.blender.org/rB39cbe8d715598942dbf110b5295972f8036b652f

fix compile error due to identifier collision

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

M	intern/cycles/render/alembic.cpp
M	intern/cycles/render/alembic.h

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

diff --git a/intern/cycles/render/alembic.cpp b/intern/cycles/render/alembic.cpp
index 43b5c72c239..72bd25db547 100644
--- a/intern/cycles/render/alembic.cpp
+++ b/intern/cycles/render/alembic.cpp
@@ -36,6 +36,8 @@
 #include "util/util_transform.h"
 #include "util/util_vector.h"
 
+using namespace Alembic::AbcGeom;
+
 CCL_NAMESPACE_BEGIN
 
 static float3 make_float3_from_yup(const Imath::Vec3<float> &v)
diff --git a/intern/cycles/render/alembic.h b/intern/cycles/render/alembic.h
index 5fad926f392..fc847d4ff09 100644
--- a/intern/cycles/render/alembic.h
+++ b/intern/cycles/render/alembic.h
@@ -27,8 +27,6 @@
 #include <Alembic/AbcCoreFactory/All.h>
 #include <Alembic/AbcGeom/All.h>
 
-using namespace Alembic::AbcGeom;
-
 CCL_NAMESPACE_BEGIN
 
 class Geometry;
@@ -48,7 +46,7 @@ class AlembicObject : public Node {
   void set_object(Object *object);
   Object *get_object();
 
-  void load_all_data(const IPolyMeshSchema &schema);
+  void load_all_data(const Alembic::AbcGeom::IPolyMeshSchema &schema);
 
   bool has_data_loaded() const;
 
@@ -74,7 +72,7 @@ class AlembicObject : public Node {
 
   DataCache &get_frame_data(int index);
 
-  IObject iobject;
+  Alembic::AbcGeom::IObject iobject;
   Transform xform;
 
  private:
@@ -86,8 +84,8 @@ class AlembicObject : public Node {
 
   vector<DataCache> frame_data;
 
-  void read_attribute(const ICompoundProperty &arb_geom_params,
-                      const ISampleSelector &iss,
+  void read_attribute(const Alembic::AbcGeom::ICompoundProperty &arb_geom_params,
+                      const Alembic::AbcGeom::ISampleSelector &iss,
                       const ustring &attr_name,
                       DataCache &data_cache);
 };
@@ -108,7 +106,7 @@ class AlembicProcedural : public Procedural {
   array<AlembicObject *> objects;  // todo : Node::set
 
  private:
-  IArchive archive;
+  Alembic::AbcGeom::IArchive archive;
   bool objects_loaded = false;
 
   void load_objects();
@@ -116,14 +114,14 @@ class AlembicProcedural : public Procedural {
   void read_mesh(Scene *scene,
                  AlembicObject *abc_object,
                  Transform xform,
-                 IPolyMesh &mesh,
-                 Abc::chrono_t frame_time);
+                 Alembic::AbcGeom::IPolyMesh &mesh,
+                 Alembic::AbcGeom::Abc::chrono_t frame_time);
 
   void read_curves(Scene *scene,
                    AlembicObject *abc_object,
                    Transform xform,
-                   ICurves &curves,
-                   Abc::chrono_t frame_time);
+                   Alembic::AbcGeom::ICurves &curves,
+                   Alembic::AbcGeom::Abc::chrono_t frame_time);
 };
 
 CCL_NAMESPACE_END