Commit: 689e6a1be750b5904fa97ed4208bc0a942827712
Author: Michael Kowalski
Date: Wed Oct 5 23:40:59 2022 -0400
Branches: tmp_usd_import_unbound_mtls
https://developer.blender.org/rB689e6a1be750b5904fa97ed4208bc0a942827712
USD import: fix fake users for unbound materials.
Now adding fake users in the import end job function,
to ensure use counts are valid.
===================================================================
M source/blender/io/usd/intern/usd_capi_import.cc
===================================================================
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);
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
