Merge branch 'master' into blender2.8
[blender.git] / source / blender / editors / util / ed_util.c
index 85a4b6ba63b62c17dfa9d6a6f623a10eb4201774..d0f29abc62f2e1f6d7634dba6ba2fbd76f5e3c3d 100644 (file)
@@ -110,7 +110,7 @@ void ED_editors_init(bContext *C)
                else {
                        data = ob->data;
                        ob->mode = OB_MODE_OBJECT;
-                       if ((ob == obact) && !ID_IS_LINKED_DATABLOCK(ob) && !(data && ID_IS_LINKED_DATABLOCK(data))) {
+                       if ((ob == obact) && !ID_IS_LINKED(ob) && !(data && ID_IS_LINKED(data))) {
                                ED_object_toggle_modes(C, mode);
                        }
                }