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

[Falk David]

Commit: f3cc01755034076ef7c9dcdc2db1efbea353e021
Author: Falk David
Date:   Thu Feb 3 12:29:25 2022 +0100
Branches: greasepencil-object
https://developer.blender.org/rBf3cc01755034076ef7c9dcdc2db1efbea353e021

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

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



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

diff --cc source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
index ba4855fa713,c2b85caad66..fede183a847
--- a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
@@@ -763,8 -756,10 +757,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_modifiers_orig_pointers(object_orig, object_cow);
        update_proxy_pointers_after_copy(depsgraph, object_orig, object_cow);
        break;
      }