diff options
author | Sybren A. Stüvel <sybren@blender.org> | 2020-06-23 12:07:44 +0300 |
---|---|---|
committer | Sybren A. Stüvel <sybren@blender.org> | 2020-06-23 12:07:52 +0300 |
commit | 13a5b954c350518cf21c9beb97e2e160f7372a9b (patch) | |
tree | 515f084e9d431476fdabb6cc94cc8c1bf46d84d6 /source/blender/io/usd/intern/usd_capi.cc | |
parent | 309cfbceaa590828b61bfd72f12ef976f9808392 (diff) |
Cleanup: USD, move code from `USD` to `blender::io::usd` namespace
No functional changes.
Diffstat (limited to 'source/blender/io/usd/intern/usd_capi.cc')
-rw-r--r-- | source/blender/io/usd/intern/usd_capi.cc | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/source/blender/io/usd/intern/usd_capi.cc b/source/blender/io/usd/intern/usd_capi.cc index cf962446d04..2d3972410a4 100644 --- a/source/blender/io/usd/intern/usd_capi.cc +++ b/source/blender/io/usd/intern/usd_capi.cc @@ -44,7 +44,9 @@ #include "WM_api.h" #include "WM_types.h" -namespace USD { +namespace blender { +namespace io { +namespace usd { struct ExportJobData { Main *bmain; @@ -157,7 +159,9 @@ static void export_endjob(void *customdata) WM_set_locked_interface(data->wm, false); } -} // namespace USD +} // namespace usd +} // namespace io +} // namespace blender bool USD_export(bContext *C, const char *filepath, @@ -167,8 +171,8 @@ bool USD_export(bContext *C, ViewLayer *view_layer = CTX_data_view_layer(C); Scene *scene = CTX_data_scene(C); - USD::ExportJobData *job = static_cast<USD::ExportJobData *>( - MEM_mallocN(sizeof(USD::ExportJobData), "ExportJobData")); + blender::io::usd::ExportJobData *job = static_cast<blender::io::usd::ExportJobData *>( + MEM_mallocN(sizeof(blender::io::usd::ExportJobData), "ExportJobData")); job->bmain = CTX_data_main(C); job->wm = CTX_wm_manager(C); @@ -186,7 +190,11 @@ bool USD_export(bContext *C, /* setup job */ WM_jobs_customdata_set(wm_job, job, MEM_freeN); WM_jobs_timer(wm_job, 0.1, NC_SCENE | ND_FRAME, NC_SCENE | ND_FRAME); - WM_jobs_callbacks(wm_job, USD::export_startjob, nullptr, nullptr, USD::export_endjob); + WM_jobs_callbacks(wm_job, + blender::io::usd::export_startjob, + nullptr, + nullptr, + blender::io::usd::export_endjob); WM_jobs_start(CTX_wm_manager(C), wm_job); } @@ -195,8 +203,8 @@ bool USD_export(bContext *C, short stop = 0, do_update = 0; float progress = 0.f; - USD::export_startjob(job, &stop, &do_update, &progress); - USD::export_endjob(job); + blender::io::usd::export_startjob(job, &stop, &do_update, &progress); + blender::io::usd::export_endjob(job); export_ok = job->export_ok; MEM_freeN(job); |