Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 27 Nov 2017 13:52:31 +0000 (14:52 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 27 Nov 2017 13:52:31 +0000 (14:52 +0100)
1  2 
source/blender/depsgraph/intern/eval/deg_eval_flush.cc

index 832d733990430c54bfbced67d7156b2215a27886,83fc756654f7452786812047eac0c73825ed56d5..93f90e5b5d26a171369f0bb46d890998f8f8f6e7
@@@ -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;