[Bf-blender-cvs] [e81aca85cbd] blender2.8: Depsgraph: Don't use derived mesh

Sergey Sharybin noreply at git.blender.org
Tue Nov 20 14:57:38 CET 2018


Commit: e81aca85cbd634db6f85b31aa8bce3585a4f0683
Author: Sergey Sharybin
Date:   Tue Nov 20 12:23:07 2018 +0100
Branches: blender2.8
https://developer.blender.org/rBe81aca85cbd634db6f85b31aa8bce3585a4f0683

Depsgraph: Don't use derived mesh

Ideally would need to make check based on evaluated mesh,
but is now a good time to go away from derived mesh.

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

M	source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc

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

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 a86ea02d5e7..636b270fe83 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
@@ -608,8 +608,6 @@ void update_special_pointers(const Depsgraph *depsgraph,
 			 */
 			Object *object_cow = (Object *)id_cow;
 			const Object *object_orig = (const Object *)id_orig;
-			BLI_assert(object_cow->derivedFinal == NULL);
-			BLI_assert(object_cow->derivedDeform == NULL);
 			object_cow->mode = object_orig->mode;
 			object_cow->sculpt = object_orig->sculpt;
 			if (object_cow->type == OB_MESH) {



More information about the Bf-blender-cvs mailing list