Merge branch 'master' into blender2.8
[blender.git] / source / blender / blenkernel / intern / object_update.c
index 8df501bd106f504e8e27dd9b99d9b2c31672e0c7..b5cb59da7d27d11e9676219f642f7ff06c7d6339 100644 (file)
@@ -203,7 +203,7 @@ void BKE_object_handle_data_update(EvaluationContext *eval_ctx,
                        break;
                }
                case OB_ARMATURE:
-                       if (ob->id.lib && ob->proxy_from) {
+                       if (ID_IS_LINKED_DATABLOCK(ob) && ob->proxy_from) {
                                if (BKE_pose_copy_result(ob->pose, ob->proxy_from->pose) == false) {
                                        printf("Proxy copy error, lib Object: %s proxy Object: %s\n",
                                               ob->id.name + 2, ob->proxy_from->id.name + 2);
@@ -268,7 +268,7 @@ void BKE_object_eval_uber_transform(EvaluationContext *UNUSED(eval_ctx),
        // XXX: it's almost redundant now...
 
        /* Handle proxy copy for target, */
-       if (ob->id.lib && ob->proxy_from) {
+       if (ID_IS_LINKED_DATABLOCK(ob) && ob->proxy_from) {
                if (ob->proxy_from->proxy_group) {
                        /* Transform proxy into group space. */
                        Object *obg = ob->proxy_from->proxy_group;