Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2017-11-27 16:52:31 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2017-11-27 16:52:31 +0300
commit488b6fa669d5ceafb8d19b451533210bf01ba258 (patch)
tree28928b20fcab6dbcee6aedce1d0d5eba9b482209 /source
parentf54e076ae648507200993f251d51710acf0b1d68 (diff)
parente3f2b1676c048a95450346a5661faee8c66f01a4 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source')
-rw-r--r--source/blender/depsgraph/intern/eval/deg_eval_flush.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
index 832d7339904..93f90e5b5d2 100644
--- 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;