[Bf-blender-cvs] [2fa72fc04c8] usd-importer-T81257-merge: USD/ABC Import: CacheReader function naming.

[makowalski]

Commit: 2fa72fc04c892a33d3ffe6b066d6bb343b3229b3
Author: makowalski
Date:   Tue Apr 13 10:11:53 2021 -0400
Branches: usd-importer-T81257-merge
https://developer.blender.org/rB2fa72fc04c892a33d3ffe6b066d6bb343b3229b3

USD/ABC Import: CacheReader function naming.

Renamed CacheReader related functions to use the ABC_ or USD_
prefixes consistently.

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

M	source/blender/blenkernel/intern/cachefile.c
M	source/blender/io/alembic/ABC_alembic.h
M	source/blender/io/alembic/intern/alembic_capi.cc
M	source/blender/io/usd/intern/usd_capi.cc
M	source/blender/io/usd/usd.h

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

diff --git a/source/blender/blenkernel/intern/cachefile.c b/source/blender/blenkernel/intern/cachefile.c
index 34c48039909..716fea67c9c 100644
--- a/source/blender/blenkernel/intern/cachefile.c
+++ b/source/blender/blenkernel/intern/cachefile.c
@@ -225,12 +225,12 @@ void BKE_cachefile_reader_free(CacheFile *cache_file, struct CacheReader **reade
       switch (cache_file->type) {
         case CACHEFILE_TYPE_ALEMBIC:
 #  ifdef WITH_ALEMBIC
-          CacheReader_free(*reader);
+          ABC_CacheReader_free(*reader);
 #  endif
           break;
         case CACHEFILE_TYPE_USD:
 #  ifdef WITH_USD
-          USDCacheReader_free(*reader);
+          USD_CacheReader_free(*reader);
 #  endif
           break;
         case CACHE_FILE_TYPE_INVALID:
@@ -267,12 +267,12 @@ static void cachefile_handle_free(CacheFile *cache_file)
         switch (cache_file->type) {
           case CACHEFILE_TYPE_ALEMBIC:
 #  ifdef WITH_ALEMBIC
-            CacheReader_free(*reader);
+            ABC_CacheReader_free(*reader);
 #  endif
             break;
           case CACHEFILE_TYPE_USD:
 #  ifdef WITH_USD
-            USDCacheReader_free(*reader);
+            USD_CacheReader_free(*reader);
 #  endif
             break;
           case CACHE_FILE_TYPE_INVALID:
diff --git a/source/blender/io/alembic/ABC_alembic.h b/source/blender/io/alembic/ABC_alembic.h
index ea0e42da729..45f49c2da92 100644
--- a/source/blender/io/alembic/ABC_alembic.h
+++ b/source/blender/io/alembic/ABC_alembic.h
@@ -121,8 +121,8 @@ bool ABC_mesh_topology_changed(struct CacheReader *reader,
                                const float time,
                                const char **err_str);
 
-void CacheReader_incref(struct CacheReader *reader);
-void CacheReader_free(struct CacheReader *reader);
+void ABC_CacheReader_incref(struct CacheReader *reader);
+void ABC_CacheReader_free(struct CacheReader *reader);
 
 struct CacheReader *CacheReader_open_alembic_object(struct CacheArchiveHandle *handle,
                                                     struct CacheReader *reader,
diff --git a/source/blender/io/alembic/intern/alembic_capi.cc b/source/blender/io/alembic/intern/alembic_capi.cc
index d962d9d00f8..15410ceb076 100644
--- a/source/blender/io/alembic/intern/alembic_capi.cc
+++ b/source/blender/io/alembic/intern/alembic_capi.cc
@@ -809,7 +809,7 @@ bool ABC_mesh_topology_changed(
 
 /* ************************************************************************** */
 
-void CacheReader_free(CacheReader *reader)
+void ABC_CacheReader_free(CacheReader *reader)
 {
   AbcObjectReader *abc_reader = reinterpret_cast<AbcObjectReader *>(reader);
   abc_reader->decref();
@@ -819,7 +819,7 @@ void CacheReader_free(CacheReader *reader)
   }
 }
 
-void CacheReader_incref(CacheReader *reader)
+void ABC_CacheReader_incref(CacheReader *reader)
 {
   AbcObjectReader *abc_reader = reinterpret_cast<AbcObjectReader *>(reader);
   abc_reader->incref();
@@ -844,7 +844,7 @@ CacheReader *CacheReader_open_alembic_object(CacheArchiveHandle *handle,
   find_iobject(archive->getTop(), iobject, object_path);
 
   if (reader) {
-    CacheReader_free(reader);
+    ABC_CacheReader_free(reader);
   }
 
   ImportSettings settings;
diff --git a/source/blender/io/usd/intern/usd_capi.cc b/source/blender/io/usd/intern/usd_capi.cc
index b4d3fae72ed..fee22ad81ad 100644
--- a/source/blender/io/usd/intern/usd_capi.cc
+++ b/source/blender/io/usd/intern/usd_capi.cc
@@ -852,7 +852,7 @@ bool USD_mesh_topology_changed(
   return usd_reader->topology_changed(existing_mesh, time);
 }
 
-void USDCacheReader_incref(CacheReader *reader)
+void USD_CacheReader_incref(CacheReader *reader)
 {
   USDPrimReader *usd_reader = reinterpret_cast<USDPrimReader *>(reader);
   usd_reader->incref();
@@ -876,7 +876,7 @@ CacheReader *CacheReader_open_usd_object(CacheArchiveHandle *handle,
   pxr::UsdPrim prim = archive->stage()->GetPrimAtPath(pxr::SdfPath(object_path));
 
   if (reader) {
-    USDCacheReader_free(reader);
+    USD_CacheReader_free(reader);
   }
 
   // TODO: The handle does not have the proper import params or settings
@@ -892,7 +892,7 @@ CacheReader *CacheReader_open_usd_object(CacheArchiveHandle *handle,
   return reinterpret_cast<CacheReader *>(usd_reader);
 }
 
-void USDCacheReader_free(CacheReader *reader)
+void USD_CacheReader_free(CacheReader *reader)
 {
   USDPrimReader *usd_reader = reinterpret_cast<USDPrimReader *>(reader);
   usd_reader->decref();
diff --git a/source/blender/io/usd/usd.h b/source/blender/io/usd/usd.h
index 7511506cd87..a57f5bb821f 100644
--- a/source/blender/io/usd/usd.h
+++ b/source/blender/io/usd/usd.h
@@ -123,8 +123,8 @@ struct CacheReader *CacheReader_open_usd_object(struct CacheArchiveHandle *handl
                                                 struct Object *object,
                                                 const char *object_path);
 
-void USDCacheReader_incref(struct CacheReader *reader);
-void USDCacheReader_free(struct CacheReader *reader);
+void USD_CacheReader_incref(struct CacheReader *reader);
+void USD_CacheReader_free(struct CacheReader *reader);
 
 #ifdef __cplusplus
 }