[Bf-blender-cvs] [488b6fa669d] blender2.8: Merge branch 'master' into blender2.8

[Sergey Sharybin]

Commit: 488b6fa669d5ceafb8d19b451533210bf01ba258
Author: Sergey Sharybin
Date:   Mon Nov 27 14:52:31 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB488b6fa669d5ceafb8d19b451533210bf01ba258

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/depsgraph/intern/eval/deg_eval_flush.cc
index 832d7339904,83fc756654f..93f90e5b5d2
--- a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
@@@ -190,9 -177,8 +190,10 @@@ void deg_graph_flush_updates(Main *bmai
  						case DEG_NODE_TYPE_ID_REF:
  						case DEG_NODE_TYPE_PARAMETERS:
  						case DEG_NODE_TYPE_SEQUENCER:
 +						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;