From e9fc25835f2091cf6533d92379a31c0656b4aafb Mon Sep 17 00:00:00 2001
From: Bastien Montagne <mont29>
Date: Thu, 3 Feb 2022 17:57:40 +0100
Subject: Remove internal proxy code, and deprecate related DNA data.

Part of T91671.

Not much else to say, this is mainly a massive deletion of code.

Note that a few cleanups possible after this proxy removal were kept out
of this commit to try to reduce a bit its size.

Reviewed By: sergey, brecht

Maniphest Tasks: T91671

Differential Revision: https://developer.blender.org/D13995
---
 source/blender/blenkernel/intern/object_update.c | 39 ++----------------------
 1 file changed, 3 insertions(+), 36 deletions(-)

(limited to 'source/blender/blenkernel/intern/object_update.c')

diff --git a/source/blender/blenkernel/intern/object_update.c b/source/blender/blenkernel/intern/object_update.c
index 1a208355870..9c2b48303b2 100644
--- a/source/blender/blenkernel/intern/object_update.c
+++ b/source/blender/blenkernel/intern/object_update.c
@@ -190,16 +190,7 @@ void BKE_object_handle_data_update(Depsgraph *depsgraph, Scene *scene, Object *o
       break;
     }
     case OB_ARMATURE:
-      if (ID_IS_LINKED(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);
-        }
-      }
-      else {
-        BKE_pose_where_is(depsgraph, scene, ob);
-      }
+      BKE_pose_where_is(depsgraph, scene, ob);
       break;
 
     case OB_MBALL:
@@ -311,33 +302,9 @@ void BKE_object_sync_to_original(Depsgraph *depsgraph, Object *object)
   object_sync_boundbox_to_original(object_orig, object);
 }
 
-bool BKE_object_eval_proxy_copy(Depsgraph *depsgraph, Object *object)
-{
-  /* Handle proxy copy for target, */
-  if (ID_IS_LINKED(object) && object->proxy_from) {
-    DEG_debug_print_eval(depsgraph, __func__, object->id.name, object);
-    if (object->proxy_from->proxy_group) {
-      /* Transform proxy into group space. */
-      Object *obg = object->proxy_from->proxy_group;
-      float imat[4][4];
-      invert_m4_m4(imat, obg->obmat);
-      mul_m4_m4m4(object->obmat, imat, object->proxy_from->obmat);
-      /* Should always be true. */
-      if (obg->instance_collection) {
-        add_v3_v3(object->obmat[3], obg->instance_collection->instance_offset);
-      }
-    }
-    else {
-      copy_m4_m4(object->obmat, object->proxy_from->obmat);
-    }
-    return true;
-  }
-  return false;
-}
-
-void BKE_object_eval_uber_transform(Depsgraph *depsgraph, Object *object)
+void BKE_object_eval_uber_transform(Depsgraph *UNUSED(depsgraph), Object *UNUSED(object))
 {
-  BKE_object_eval_proxy_copy(depsgraph, object);
+  return;
 }
 
 void BKE_object_data_batch_cache_dirty_tag(ID *object_data)
-- 
cgit v1.2.3