Commit: 71bd1b20ecad4024b91865c020af9f77573f10f0
Author: Sergey Sharybin
Date: Thu Dec 18 18:45:45 2014 +0500
Branches: depsgraph_refactor
https://developer.blender.org/rB71bd1b20ecad4024b91865c020af9f77573f10f0
Depsgraph: Fix assert failure in the parents counting
Currently time source is allowed parent for modifiers which depends on time,
so we can not expect parents to be operation nodes.
===================================================================
M source/blender/depsgraph/intern/depsgraph_eval.cpp
===================================================================
diff --git a/source/blender/depsgraph/intern/depsgraph_eval.cpp
b/source/blender/depsgraph/intern/depsgraph_eval.cpp
index 92ebba6..2e9e02b 100644
--- a/source/blender/depsgraph/intern/depsgraph_eval.cpp
+++ b/source/blender/depsgraph/intern/depsgraph_eval.cpp
@@ -123,7 +123,8 @@ static void calculate_pending_parents(Depsgraph *graph)
DepsRelation *rel = *it_rel;
OperationDepsNode *from = (OperationDepsNode
*)rel->from;
- BLI_assert(rel->from->type ==
DEPSNODE_TYPE_OPERATION);
+ BLI_assert(ELEM(rel->from->type,
DEPSNODE_TYPE_OPERATION,
+
DEPSNODE_TYPE_TIMESOURCE));
if (from->flag & DEPSOP_FLAG_NEEDS_UPDATE)
++node->num_links_pending;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
