[Bf-blender-cvs] [cedc7676ace] master: Depsgraph: Cleanup, function return value

Sergey Sharybin noreply at git.blender.org
Fri Mar 2 16:36:26 CET 2018


Commit: cedc7676acee926bd726bde1214e7e448b456c3e
Author: Sergey Sharybin
Date:   Fri Mar 2 14:12:33 2018 +0100
Branches: master
https://developer.blender.org/rBcedc7676acee926bd726bde1214e7e448b456c3e

Depsgraph: Cleanup, function return value

Driver build result was never used, so no reason to return operation.

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

M	source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
M	source/blender/depsgraph/intern/builder/deg_builder_nodes.h

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

diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index 7572ee90c0b..c0afec08a00 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@ -516,7 +516,7 @@ void DepsgraphNodeBuilder::build_animdata(ID *id)
  * \param id: ID-Block that driver is attached to
  * \param fcu: Driver-FCurve
  */
-OperationDepsNode *DepsgraphNodeBuilder::build_driver(ID *id, FCurve *fcu)
+void DepsgraphNodeBuilder::build_driver(ID *id, FCurve *fcu)
 {
 	/* Create data node for this driver */
 	/* TODO(sergey): Avoid creating same operation multiple times,
@@ -528,18 +528,14 @@ OperationDepsNode *DepsgraphNodeBuilder::build_driver(ID *id, FCurve *fcu)
 	                                                   DEG_OPCODE_DRIVER,
 	                                                   fcu->rna_path ? fcu->rna_path : "",
 	                                                   fcu->array_index);
-
 	if (driver_op == NULL) {
-		driver_op = add_operation_node(id,
-		                               DEG_NODE_TYPE_PARAMETERS,
-		                               function_bind(BKE_animsys_eval_driver, _1, id, fcu),
-		                               DEG_OPCODE_DRIVER,
-		                               fcu->rna_path ? fcu->rna_path : "",
-		                               fcu->array_index);
+		add_operation_node(id,
+		                   DEG_NODE_TYPE_PARAMETERS,
+		                   function_bind(BKE_animsys_eval_driver, _1, id, fcu),
+		                   DEG_OPCODE_DRIVER,
+		                   fcu->rna_path ? fcu->rna_path : "",
+		                   fcu->array_index);
 	}
-
-	/* return driver node created */
-	return driver_op;
 }
 
 /* Recursively build graph for world */
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.h b/source/blender/depsgraph/intern/builder/deg_builder_nodes.h
index 825015194e2..a18bb4dab6a 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.h
@@ -130,7 +130,7 @@ struct DepsgraphNodeBuilder {
 	void build_particles(Object *object);
 	void build_cloth(Object *object);
 	void build_animdata(ID *id);
-	OperationDepsNode *build_driver(ID *id, FCurve *fcurve);
+	void build_driver(ID *id, FCurve *fcurve);
 	void build_ik_pose(Object *object,
 	                   bPoseChannel *pchan,
 	                   bConstraint *con);



More information about the Bf-blender-cvs mailing list