blender
/
blender
128
396
Fork 569
Code Issues 6.2k Pull Requests 756 Projects 19 Wiki Activity

Depsgraph: Only store original mesh pointer for mesh object

This commit is contained in:
Sergey Sharybin 2018-06-04 15:24:10 +02:00
parent 52f9023fbf
commit 2b22a61152
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenkernel/intern/object.c
View File

@ -2851,7 +2851,6 @@ Mesh *BKE_object_get_evaluated_mesh(const Depsgraph *depsgraph, Object *ob)
return ob_eval->runtime.mesh_eval;
}
static int pc_cmp(const void *a, const void *b)
{
const LinkData *ad = a, *bd = b;

4
source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
View File

@ -542,7 +542,9 @@ void update_special_pointers(const Depsgraph *depsgraph,
BLI_assert(object_cow->derivedDeform == NULL);
object_cow->mode = object_orig->mode;
object_cow->sculpt = object_orig->sculpt;
object_cow->runtime.mesh_orig = (Mesh *)object_cow->data;
if (object_cow->type == OB_MESH) {
object_cow->runtime.mesh_orig = (Mesh *)object_cow->data;
}
if (object_cow->type == OB_ARMATURE) {
BKE_pose_remap_bone_pointers((bArmature *)object_cow->data,
object_cow->pose);