diff options
Diffstat (limited to 'source/blender/blenkernel/intern/mesh.c')
| -rw-r--r-- | source/blender/blenkernel/intern/mesh.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index 706902ef3cf..129f89c2b8e 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -549,7 +549,7 @@ Mesh *BKE_mesh_copy_ex(Main *bmain, Mesh *me) men->key = BKE_key_copy(me->key); if (men->key) men->key->from = (ID *)men; - if (me->id.lib) { + if (ID_IS_LINKED_DATABLOCK(me)) { BKE_id_lib_local_paths(bmain, me->id.lib, &men->id); } @@ -628,7 +628,7 @@ void BKE_mesh_make_local(Mesh *me) * - mixed: make copy */ - if (me->id.lib == NULL) return; + if (!ID_IS_LINKED_DATABLOCK(me)) return; if (me->id.us == 1) { id_clear_lib_data(bmain, &me->id); expand_local_mesh(me); @@ -637,7 +637,7 @@ void BKE_mesh_make_local(Mesh *me) for (ob = bmain->object.first; ob && ELEM(0, is_lib, is_local); ob = ob->id.next) { if (me == ob->data) { - if (ob->id.lib) is_lib = true; + if (ID_IS_LINKED_DATABLOCK(ob)) is_lib = true; else is_local = true; } } @@ -656,7 +656,7 @@ void BKE_mesh_make_local(Mesh *me) for (ob = bmain->object.first; ob; ob = ob->id.next) { if (me == ob->data) { - if (ob->id.lib == NULL) { + if (!ID_IS_LINKED_DATABLOCK(ob)) { BKE_mesh_assign_object(ob, me_new); } } |