[Bf-blender-cvs] [784ea87375c] universal-scene-description: Merge branch 'master' into universal-scene-description

[Michael Kowalski]

Commit: 784ea87375cebd7c12faada555f65c741895bca0
Author: Michael Kowalski
Date:   Mon Oct 24 15:28:20 2022 -0400
Branches: universal-scene-description
https://developer.blender.org/rB784ea87375cebd7c12faada555f65c741895bca0

Merge branch 'master' into universal-scene-description

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



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

diff --cc source/blender/io/usd/intern/usd_reader_mesh.cc
index 7a12258df0a,01db6baeb5c..9c0c76a50c1
--- a/source/blender/io/usd/intern/usd_reader_mesh.cc
+++ b/source/blender/io/usd/intern/usd_reader_mesh.cc
@@@ -861,11 -804,10 +861,11 @@@ void USDMeshReader::readFaceSetsSample(
    std::map<pxr::SdfPath, int> mat_map;
  
    bke::MutableAttributeAccessor attributes = mesh->attributes_for_write();
-   bke::SpanAttributeWriter<int> material_indices =
-       attributes.lookup_or_add_for_write_only_span<int>("material_index", ATTR_DOMAIN_FACE);
+   bke::SpanAttributeWriter<int> material_indices = attributes.lookup_or_add_for_write_span<int>(
+       "material_index", ATTR_DOMAIN_FACE);
    this->assign_facesets_to_material_indices(motionSampleTime, material_indices.span, &mat_map);
    material_indices.finish();
 +
    /* Build material name map if it's not built yet. */
    if (this->settings_->mat_name_to_mat.empty()) {
      utils::build_mat_map(bmain, &this->settings_->mat_name_to_mat);