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/collada | |
| parent | 82e3513a8d0fcfb3e7410b88a4ba5683bb45876b (diff) | |
| parent | f366d197db24cf611866a8d847b4022a6a46504e (diff) | |
Merge branch 'blender-v3.3-release'
Diffstat (limited to 'source/blender/io/collada')
| -rw-r--r-- | source/blender/io/collada/DocumentImporter.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/io/collada/DocumentImporter.cpp b/source/blender/io/collada/DocumentImporter.cpp index 2ce97bc8b5d..1ffe412b3ed 100644 --- a/source/blender/io/collada/DocumentImporter.cpp +++ b/source/blender/io/collada/DocumentImporter.cpp @@ -743,6 +743,7 @@ bool DocumentImporter::writeMaterial(const COLLADAFW::Material *cmat) const std::string &str_mat_id = cmat->getName().empty() ? cmat->getOriginalId() : cmat->getName(); Material *ma = BKE_material_add(bmain, (char *)str_mat_id.c_str()); + id_us_min(&ma->id); this->uid_effect_map[cmat->getInstantiatedEffect()] = ma; this->uid_material_map[cmat->getUniqueId()] = ma; |