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/alembic/intern | |
| parent | 82e3513a8d0fcfb3e7410b88a4ba5683bb45876b (diff) | |
| parent | f366d197db24cf611866a8d847b4022a6a46504e (diff) | |
Merge branch 'blender-v3.3-release'
Diffstat (limited to 'source/blender/io/alembic/intern')
| -rw-r--r-- | source/blender/io/alembic/intern/abc_reader_mesh.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/io/alembic/intern/abc_reader_mesh.cc b/source/blender/io/alembic/intern/abc_reader_mesh.cc index 16e5ee968a3..a4b6c32ef64 100644 --- a/source/blender/io/alembic/intern/abc_reader_mesh.cc +++ b/source/blender/io/alembic/intern/abc_reader_mesh.cc @@ -26,6 +26,7 @@ #include "BLI_math_geom.h" #include "BKE_attribute.hh" +#include "BKE_lib_id.h" #include "BKE_main.h" #include "BKE_material.h" #include "BKE_mesh.h" @@ -93,6 +94,7 @@ static void assign_materials(Main *bmain, mat_iter = matname_to_material.find(mat_name); if (mat_iter == matname_to_material.end()) { assigned_mat = BKE_material_add(bmain, mat_name.c_str()); + id_us_min(&assigned_mat->id); matname_to_material[mat_name] = assigned_mat; } else { @@ -101,6 +103,9 @@ static void assign_materials(Main *bmain, BKE_object_material_assign_single_obdata(bmain, ob, assigned_mat, mat_index); } + if (ob->totcol > 0) { + ob->actcol = 1; + } } } /* namespace utils */ |