[Bf-blender-cvs] [ff6e8b0b500] blender2.8: Depsgraph: Avoid assert failure in some harmless cases
Sergey Sharybin
noreply at git.blender.org
Mon Jul 24 17:41:55 CEST 2017
Commit: ff6e8b0b500fe839dfdb4dbe7ef75a7c15f6e34d
Author: Sergey Sharybin
Date: Mon Jul 24 17:41:29 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBff6e8b0b500fe839dfdb4dbe7ef75a7c15f6e34d
Depsgraph: Avoid assert failure in some harmless cases
===================================================================
M source/blender/depsgraph/intern/depsgraph.cc
===================================================================
diff --git a/source/blender/depsgraph/intern/depsgraph.cc b/source/blender/depsgraph/intern/depsgraph.cc
index 5640a22cf2a..0644b8d6abd 100644
--- a/source/blender/depsgraph/intern/depsgraph.cc
+++ b/source/blender/depsgraph/intern/depsgraph.cc
@@ -449,7 +449,16 @@ ID *Depsgraph::get_cow_id(const ID *id_orig) const
* safer game here.
*/
if ((id_orig->tag & LIB_TAG_COPY_ON_WRITE) == 0) {
- BLI_assert(!"Request for non-existing copy-on-write ID");
+ /* TODO(sergey): This is nice sanity check to have, but it fails
+ * in following situations:
+ *
+ * - Material has link to texture, which is not needed by new
+ * shading system and hence can be ignored at construction.
+ * - Object or mesh has material at a slot which is not used (for
+ * example, object has material slot by materials are set to
+ * object data).
+ */
+ // BLI_assert(!"Request for non-existing copy-on-write ID");
}
return (ID *)id_orig;
}
More information about the Bf-blender-cvs
mailing list