[Bf-blender-cvs] [d3b5fa502e5] greasepencil-object: Merge branch 'master' into patch/gpencil-update-on-write

[Falk David]

Commit: d3b5fa502e5ca30d664f73c33008477b1e359f47
Author: Falk David
Date:   Fri Feb 4 15:48:18 2022 +0100
Branches: greasepencil-object
https://developer.blender.org/rBd3b5fa502e5ca30d664f73c33008477b1e359f47

Merge branch 'master' into patch/gpencil-update-on-write

===================================================================



===================================================================

diff --cc source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
index fede183a847,5f99d1c8d7a..69e843311ea
--- a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
@@@ -757,8 -737,10 +738,7 @@@ void update_id_after_copy(const Depsgra
          }
          BKE_pose_pchan_index_rebuild(object_cow->pose);
        }
 -      if (object_cow->type == OB_GPENCIL) {
 -        BKE_gpencil_update_orig_pointers(object_orig, object_cow);
 -      }
        update_particles_after_copy(depsgraph, object_orig, object_cow);
-       update_proxy_pointers_after_copy(depsgraph, object_orig, object_cow);
        break;
      }
      case ID_SCE: {