blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

Fix error in recent rename 

This function is defined outside of Blender.
This commit is contained in:
Campbell Barton 2020-08-01 20:04:22 +10:00
parent 6119f3cad1
commit 6141549fee
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/io/usd/tests/usd_stage_creation_test.cc
View File

@ -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

4
source/creator/creator.c
View File

@ -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) {