[Bf-blender-cvs] [1d8db50538c] blender2.8: Depsgraph: Remove unused operation code

Sergey Sharybin noreply at git.blender.org
Wed Nov 14 14:09:23 CET 2018


Commit: 1d8db50538c4ba933d0a5faf97807ace1a9f6386
Author: Sergey Sharybin
Date:   Tue Nov 13 19:31:44 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB1d8db50538c4ba933d0a5faf97807ace1a9f6386

Depsgraph: Remove unused operation code

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

M	source/blender/depsgraph/DEG_depsgraph_build.h
M	source/blender/depsgraph/intern/depsgraph_build.cc
M	source/blender/depsgraph/intern/depsgraph_physics.cc

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

diff --git a/source/blender/depsgraph/DEG_depsgraph_build.h b/source/blender/depsgraph/DEG_depsgraph_build.h
index c09c811121b..1895b483644 100644
--- a/source/blender/depsgraph/DEG_depsgraph_build.h
+++ b/source/blender/depsgraph/DEG_depsgraph_build.h
@@ -125,8 +125,6 @@ typedef enum eDepsObjectComponentType {
 	/* Bone Component - Child/Subcomponent of Pose */
 	DEG_OB_COMP_BONE,
 
-	/* Particle Systems Component */
-	DEG_OB_COMP_EVAL_PARTICLES,
 	/* Material Shading Component */
 	DEG_OB_COMP_SHADING,
 	/* Cache Component */
diff --git a/source/blender/depsgraph/intern/depsgraph_build.cc b/source/blender/depsgraph/intern/depsgraph_build.cc
index eb125229c6a..f5b84b91dbe 100644
--- a/source/blender/depsgraph/intern/depsgraph_build.cc
+++ b/source/blender/depsgraph/intern/depsgraph_build.cc
@@ -93,7 +93,6 @@ static DEG::eDepsNode_Type deg_build_object_component_type(
 		case DEG_OB_COMP_GEOMETRY:          return DEG::DEG_NODE_TYPE_GEOMETRY;
 		case DEG_OB_COMP_EVAL_POSE:         return DEG::DEG_NODE_TYPE_EVAL_POSE;
 		case DEG_OB_COMP_BONE:              return DEG::DEG_NODE_TYPE_BONE;
-		case DEG_OB_COMP_EVAL_PARTICLES:    return DEG::DEG_NODE_TYPE_EVAL_PARTICLES;
 		case DEG_OB_COMP_SHADING:           return DEG::DEG_NODE_TYPE_SHADING;
 		case DEG_OB_COMP_CACHE:             return DEG::DEG_NODE_TYPE_CACHE;
 	}
diff --git a/source/blender/depsgraph/intern/depsgraph_physics.cc b/source/blender/depsgraph/intern/depsgraph_physics.cc
index 1299542e823..0a54caebace 100644
--- a/source/blender/depsgraph/intern/depsgraph_physics.cc
+++ b/source/blender/depsgraph/intern/depsgraph_physics.cc
@@ -149,10 +149,9 @@ void DEG_add_forcefield_relations(DepsNodeHandle *handle,
 		DEG_add_object_relation(
 		        handle, relation->ob, DEG_OB_COMP_TRANSFORM, name);
 		if (relation->psys) {
-			DEG_add_object_relation(
-			        handle, relation->ob, DEG_OB_COMP_EVAL_PARTICLES, name);
-			/* TODO: remove this when/if EVAL_PARTICLES is sufficient for up to
-			 * date particles. */
+			/* TODO(sergey): Consider going more granular with more dedicated
+			 * particle system operation.
+			 */
 			DEG_add_object_relation(
 			        handle, relation->ob, DEG_OB_COMP_GEOMETRY, name);
 		}



More information about the Bf-blender-cvs mailing list