diff options
| author | Aras Pranckevicius <aras@nesnausk.org> | 2022-09-01 20:44:09 +0300 |
|---|---|---|
| committer | Aras Pranckevicius <aras@nesnausk.org> | 2022-09-01 20:44:09 +0300 |
| commit | 08894ac929cbad25219d107f7877b1300135fb60 (patch) | |
| tree | 434d98a19022c131730891a3ae8d6c26aa36e2d5 /source/blender/io/usd/intern | |
| parent | 82e3513a8d0fcfb3e7410b88a4ba5683bb45876b (diff) | |
| parent | f366d197db24cf611866a8d847b4022a6a46504e (diff) | |
Merge branch 'blender-v3.3-release'
Diffstat (limited to 'source/blender/io/usd/intern')
| -rw-r--r-- | source/blender/io/usd/intern/usd_reader_material.cc | 2 | ||||
| -rw-r--r-- | source/blender/io/usd/intern/usd_reader_mesh.cc | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/io/usd/intern/usd_reader_material.cc b/source/blender/io/usd/intern/usd_reader_material.cc index f59b8be147e..4b72a075106 100644 --- a/source/blender/io/usd/intern/usd_reader_material.cc +++ b/source/blender/io/usd/intern/usd_reader_material.cc @@ -4,6 +4,7 @@ #include "usd_reader_material.h" #include "BKE_image.h" +#include "BKE_lib_id.h" #include "BKE_main.h" #include "BKE_material.h" #include "BKE_node.h" @@ -323,6 +324,7 @@ Material *USDMaterialReader::add_material(const pxr::UsdShadeMaterial &usd_mater /* Create the material. */ Material *mtl = BKE_material_add(bmain_, mtl_name.c_str()); + id_us_min(&mtl->id); /* Get the UsdPreviewSurface shader source for the material, * if there is one. */ diff --git a/source/blender/io/usd/intern/usd_reader_mesh.cc b/source/blender/io/usd/intern/usd_reader_mesh.cc index 89a98097780..4155f6ac40f 100644 --- a/source/blender/io/usd/intern/usd_reader_mesh.cc +++ b/source/blender/io/usd/intern/usd_reader_mesh.cc @@ -183,6 +183,9 @@ static void assign_materials(Main *bmain, std::cout << "WARNING: Couldn't assign material " << it->first << std::endl; } } + if (ob->totcol > 0) { + ob->actcol = 1; + } } } // namespace utils |