Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Kowalski <makowalski@nvidia.com>2022-10-06 06:40:59 +0300
committerMichael Kowalski <makowalski@nvidia.com>2022-10-06 06:40:59 +0300
commit689e6a1be750b5904fa97ed4208bc0a942827712 (patch)
treebec3578e188812b6038b59efb8c6448647b00535
parent092fe1ef293280cbf0ff2f8b892f5c455aea3c38 (diff)
USD import: fix fake users for unbound materials.
Now adding fake users in the import end job function, to ensure use counts are valid.
-rw-r--r--source/blender/io/usd/intern/usd_capi_import.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/io/usd/intern/usd_capi_import.cc b/source/blender/io/usd/intern/usd_capi_import.cc
index 29f3792792b..52f1fcf4e8f 100644
--- a/source/blender/io/usd/intern/usd_capi_import.cc
+++ b/source/blender/io/usd/intern/usd_capi_import.cc
@@ -231,10 +231,6 @@ static void import_startjob(void *customdata, short *stop, short *do_update, flo
archive->collect_readers(data->bmain);
- if (data->params.import_unbound_materials) {
- archive->fake_users_for_unbound_materials();
- }
-
*data->do_update = true;
*data->progress = 0.2f;
@@ -363,6 +359,10 @@ static void import_endjob(void *customdata)
DEG_id_tag_update(&data->scene->id, ID_RECALC_BASE_FLAGS);
DEG_relations_tag_update(data->bmain);
+
+ if (data->params.import_unbound_materials) {
+ data->archive->fake_users_for_unbound_materials();
+ }
}
WM_set_locked_interface(data->wm, false);