Merge branch 'master' into blender2.8

2017-11-27 14:52:31 +01:00
parent f54e076ae6 e3f2b1676c
commit 488b6fa669
1 changed files with 1 additions and 0 deletions
--- a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
@@ -193,6 +193,7 @@ void deg_graph_flush_updates(Main *bmain, Depsgraph *graph)
 						case DEG_NODE_TYPE_LAYER_COLLECTIONS:
 						case DEG_NODE_TYPE_COPY_ON_WRITE:
 							/* Ignore, does not translate to object component. */
+							BLI_assert(!"This should never happen!");
 							break;
 						case DEG_NODE_TYPE_ANIMATION:
 							object->recalc |= OB_RECALC_TIME;