Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brecht>2020-02-27 13:23:15 +0300
committerBrecht Van Lommel <brecht@blender.org>2020-02-28 15:49:35 +0300
commit318112379d6d251334b8f3d2a20b935210446b4f (patch)
tree5fc125ebf73805d209ca071d4118fcede4920c2b /source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
parentc60be37f3ebf20ab9b4563d03c0acb97ecf047cc (diff)
Objects: make evaluated data runtime storage usable for types other than mesh
This is in preparation of new object types. This only changes mesh_eval, we may do the same for mesh_deform_eval and other areas in the future if there is a need for it. This previously caused a bug in T74283, that should be fixed now. Differential Revision: https://developer.blender.org/D6695
Diffstat (limited to 'source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc')
-rw-r--r--source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
index edb02ee331f..95521ee9e47 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
@@ -781,9 +781,7 @@ void update_id_after_copy(const Depsgraph *depsgraph,
const Object *object_orig = (const Object *)id_orig;
object_cow->mode = object_orig->mode;
object_cow->sculpt = object_orig->sculpt;
- if (object_cow->type == OB_MESH) {
- object_cow->runtime.mesh_orig = (Mesh *)object_cow->data;
- }
+ object_cow->runtime.data_orig = (ID *)object_cow->data;
if (object_cow->type == OB_ARMATURE) {
const bArmature *armature_orig = (bArmature *)object_orig->data;
bArmature *armature_cow = (bArmature *)object_cow->data;