diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2020-01-18 19:25:59 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2020-01-20 11:39:54 +0300 |
commit | 6368343da9a0aed8511de37b91161ea47418909d (patch) | |
tree | 3ee51bc974b002e380e2caf1c6fea91f12ce12b9 /source/blender/collada | |
parent | 6395937b01f0f6ca8669d694edcf9e7d258a30a1 (diff) |
Fix T73129: sculpt mode slow on mesh with fake user
We can't use the fast path when the mesh is used by mulitple objects and so
slower sculpting is expected then. But fake users should not affect this. This
also fixes the same type of error in a few other areas.
Diffstat (limited to 'source/blender/collada')
-rw-r--r-- | source/blender/collada/MeshImporter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/collada/MeshImporter.cpp b/source/blender/collada/MeshImporter.cpp index 64031e10d77..94791df7b6f 100644 --- a/source/blender/collada/MeshImporter.cpp +++ b/source/blender/collada/MeshImporter.cpp @@ -1014,12 +1014,12 @@ void MeshImporter::optimize_material_assignements() ++it) { Object *ob = (*it); Mesh *me = (Mesh *)ob->data; - if (me->id.us == 1) { + if (BKE_id_num_real_users(&me->id) == 1) { bc_copy_materials_to_data(ob, me); bc_remove_materials_from_object(ob, me); bc_remove_mark(ob); } - else if (me->id.us > 1) { + else if (BKE_id_num_real_users(&me->id) > 1) { bool can_move = true; std::vector<Object *> mesh_users = get_all_users_of(me); if (mesh_users.size() > 1) { |