[Bf-blender-cvs] [6141549feef] master: Fix error in recent rename

[Campbell Barton]

Commit: 6141549feefcdd33ba36cecf7fb97f0b360f3bb4
Author: Campbell Barton
Date:   Sat Aug 1 20:04:22 2020 +1000
Branches: master
https://developer.blender.org/rB6141549feefcdd33ba36cecf7fb97f0b360f3bb4

Fix error in recent rename

This function is defined outside of Blender.

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

M	source/blender/io/usd/tests/usd_stage_creation_test.cc
M	source/creator/creator.c

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

diff --git a/source/blender/io/usd/tests/usd_stage_creation_test.cc b/source/blender/io/usd/tests/usd_stage_creation_test.cc
index 97d23f57175..e6bd0bab6ce 100644
--- a/source/blender/io/usd/tests/usd_stage_creation_test.cc
+++ b/source/blender/io/usd/tests/usd_stage_creation_test.cc
@@ -28,7 +28,7 @@
 
 extern "C" {
 /* Workaround to make it possible to pass a path at runtime to USD. See creator.c. */
-void usd_init_plugin_path(const char *datafiles_usd_path);
+void usd_initialise_plugin_path(const char *datafiles_usd_path);
 }
 
 namespace blender::io::usd {
@@ -46,7 +46,7 @@ TEST_F(USDStageCreationTest, JSONFileLoadingTest)
   char usd_datafiles_dir[FILE_MAX];
   BLI_path_join(usd_datafiles_dir, FILE_MAX, release_dir.c_str(), "datafiles", "usd", nullptr);
 
-  usd_init_plugin_path(usd_datafiles_dir);
+  usd_initialise_plugin_path(usd_datafiles_dir);
 
   /* Simply the ability to create a USD Stage for a specific filename means that the extension
    * has been recognized by the USD library, and that a USD plugin has been loaded to write such
diff --git a/source/creator/creator.c b/source/creator/creator.c
index d53d2cb053d..2793765bf2c 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -127,7 +127,7 @@ void main_python_exit(void);
  *
  * This function is implemented in the USD source code, `pxr/base/lib/plug/initConfig.cpp`.
  */
-void usd_init_plugin_path(const char *datafiles_usd_path);
+void usd_initialise_plugin_path(const char *datafiles_usd_path);
 #endif
 
 /* written to by 'creator_args.c' */
@@ -443,7 +443,7 @@ int main(int argc,
 #ifdef WITH_USD
   /* Tell USD which directory to search for its JSON files. If 'datafiles/usd'
    * does not exist, the USD library will not be able to read or write any files. */
-  usd_init_plugin_path(BKE_appdir_folder_id(BLENDER_DATAFILES, "usd"));
+  usd_initialise_plugin_path(BKE_appdir_folder_id(BLENDER_DATAFILES, "usd"));
 #endif
 
   if (G.background == 0) {