[Bf-blender-cvs] [51911047762] blender2.8: Depsgraph: Sanitize placement of component types in switch statement

Sergey Sharybin noreply at git.blender.org
Mon Nov 27 15:35:10 CET 2017


Commit: 519110477626da78ae9c45f4546293ad319c4d7e
Author: Sergey Sharybin
Date:   Mon Nov 27 15:34:36 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB519110477626da78ae9c45f4546293ad319c4d7e

Depsgraph: Sanitize placement of component types in switch statement

Makes it more clear why and what is being ignored.

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

M	source/blender/depsgraph/intern/eval/deg_eval_flush.cc

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

diff --git a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
index 93f90e5b5d2..715a95432c0 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
@@ -190,8 +190,6 @@ void deg_graph_flush_updates(Main *bmain, Depsgraph *graph)
 						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;
@@ -212,6 +210,9 @@ void deg_graph_flush_updates(Main *bmain, Depsgraph *graph)
 							break;
 						case DEG_NODE_TYPE_BATCH_CACHE:
 						case DEG_NODE_TYPE_SHADING_PARAMETERS:
+						case DEG_NODE_TYPE_LAYER_COLLECTIONS:
+						case DEG_NODE_TYPE_COPY_ON_WRITE:
+							/* Ignore, does not translate to recalc flags. */
 							break;
 					}



More information about the Bf-blender-cvs mailing list