diff options
| author | Pablo Vazquez <pablo@blender.org> | 2021-11-05 18:23:56 +0300 |
|---|---|---|
| committer | Pablo Vazquez <pablo@blender.org> | 2021-11-05 18:23:56 +0300 |
| commit | bbd8d33453fca1be05bced39dcbff5ee02fa8da3 (patch) | |
| tree | 878563268d8ae736ce82f6eb2d17e32209acf53e /source/blender/blenkernel/intern/object.cc | |
| parent | f415b41a94ceedf1a43cb53500cb0dcf57522bb2 (diff) | |
| parent | 7c755293330e8ebe8717b0a34e6031b4e3186f0d (diff) | |
Merge branch 'blender-v3.0-release'
Diffstat (limited to 'source/blender/blenkernel/intern/object.cc')
| -rw-r--r-- | source/blender/blenkernel/intern/object.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/object.cc b/source/blender/blenkernel/intern/object.cc index a63f0091586..75d204a46e4 100644 --- a/source/blender/blenkernel/intern/object.cc +++ b/source/blender/blenkernel/intern/object.cc @@ -5848,7 +5848,7 @@ void BKE_object_replace_data_on_shallow_copy(Object *ob, ID *new_data) ob->type = BKE_object_obdata_to_type(new_data); ob->data = (void *)new_data; ob->runtime.geometry_set_eval = nullptr; - ob->runtime.data_eval = nullptr; + ob->runtime.data_eval = new_data; if (ob->runtime.bb != nullptr) { ob->runtime.bb->flag |= BOUNDBOX_DIRTY; } |