Merge branch 'master' into asset-uuid--archivedasset-uuid--archived

1 files changed, 4 insertions, 3 deletions

diff --git a/source/blender/editors/object/object_facemap_ops.c b/source/blender/editors/object/object_facemap_ops.c
index 147bd3d7871..6e0376358bb 100644
--- a/source/blender/editors/object/object_facemap_ops.c
+++ b/source/blender/editors/object/object_facemap_ops.c
@@ -171,14 +171,15 @@ static bool face_map_supported_poll(bContext *C)
 {
   Object *ob = ED_object_context(C);
   ID *data = (ob) ? ob->data : NULL;
-  return (ob && !ob->id.lib && ob->type == OB_MESH && data && !data->lib);
+  return (ob && !ID_IS_LINKED(ob) && !ID_IS_OVERRIDE_LIBRARY(ob) && ob->type == OB_MESH && data &&
+          !ID_IS_LINKED(data) && !ID_IS_OVERRIDE_LIBRARY(data));
 }
 
 static bool face_map_supported_edit_mode_poll(bContext *C)
 {
   Object *ob = ED_object_context(C);
-  ID *data = (ob) ? ob->data : NULL;
-  if (ob && !ob->id.lib && ob->type == OB_MESH && data && !data->lib) {
+
+  if (face_map_supported_poll(C)) {
     if (ob->mode == OB_MODE_EDIT) {
       return true;
     }