[Bf-blender-cvs] [0af91d7fe68] master: Cleanup: Remove unused argument

[Sergey Sharybin]

Commit: 0af91d7fe68d661122e8f7ab9fe343b7edc3ca79
Author: Sergey Sharybin
Date:   Wed Nov 29 16:14:39 2017 +0100
Branches: master
https://developer.blender.org/rB0af91d7fe68d661122e8f7ab9fe343b7edc3ca79

Cleanup: Remove unused argument

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

M	source/blender/blenkernel/BKE_object.h
M	source/blender/blenkernel/intern/object_update.c
M	source/blender/depsgraph/intern/builder/deg_builder_nodes.cc

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

diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h
index 2772b3e2e6b..83a9dfaa6a7 100644
--- a/source/blender/blenkernel/BKE_object.h
+++ b/source/blender/blenkernel/BKE_object.h
@@ -179,7 +179,6 @@ void BKE_object_tfm_protected_restore(struct Object *ob,
 
 /* Dependency graph evaluation callbacks. */
 void BKE_object_eval_local_transform(struct EvaluationContext *eval_ctx,
-                                     struct Scene *scene,
                                      struct Object *ob);
 void BKE_object_eval_parent(struct EvaluationContext *eval_ctx,
                             struct Scene *scene,
@@ -190,7 +189,6 @@ void BKE_object_eval_constraints(struct EvaluationContext *eval_ctx,
 void BKE_object_eval_done(struct EvaluationContext *eval_ctx, struct Object *ob);
 
 void BKE_object_eval_uber_transform(struct EvaluationContext *eval_ctx,
-                                    struct Scene *scene,
                                     struct Object *ob);
 void BKE_object_eval_uber_data(struct EvaluationContext *eval_ctx,
                                struct Scene *scene,
diff --git a/source/blender/blenkernel/intern/object_update.c b/source/blender/blenkernel/intern/object_update.c
index fd2b5ff589f..ef6827dca5c 100644
--- a/source/blender/blenkernel/intern/object_update.c
+++ b/source/blender/blenkernel/intern/object_update.c
@@ -70,7 +70,6 @@
 static ThreadMutex material_lock = BLI_MUTEX_INITIALIZER;
 
 void BKE_object_eval_local_transform(EvaluationContext *UNUSED(eval_ctx),
-                                     Scene *UNUSED(scene),
                                      Object *ob)
 {
 	DEBUG_PRINT("%s on %s\n", __func__, ob->id.name);
@@ -297,7 +296,6 @@ void BKE_object_handle_data_update(EvaluationContext *eval_ctx,
 }
 
 void BKE_object_eval_uber_transform(EvaluationContext *UNUSED(eval_ctx),
-                                    Scene *UNUSED(scene),
                                     Object *ob)
 {
 	/* TODO(sergey): Currently it's a duplicate of logic in BKE_object_handle_update_ex(). */
@@ -337,7 +335,9 @@ void BKE_object_eval_uber_data(EvaluationContext *eval_ctx,
 	ob->recalc &= ~(OB_RECALC_DATA | OB_RECALC_TIME);
 }
 
-void BKE_object_eval_cloth(EvaluationContext *UNUSED(eval_ctx), Scene *scene, Object *object)
+void BKE_object_eval_cloth(EvaluationContext *UNUSED(eval_ctx),
+                           Scene *scene,
+                           Object *object)
 {
 	DEBUG_PRINT("%s on %s\n", __func__, object->id.name);
 	BKE_ptcache_object_reset(scene, object, PTCACHE_RESET_DEPSGRAPH);
@@ -348,13 +348,13 @@ void BKE_object_eval_transform_all(EvaluationContext *eval_ctx,
                                    Object *object)
 {
 	/* This mimics full transform update chain from new depsgraph. */
-	BKE_object_eval_local_transform(eval_ctx, scene, object);
+	BKE_object_eval_local_transform(eval_ctx, object);
 	if (object->parent != NULL) {
 		BKE_object_eval_parent(eval_ctx, scene, object);
 	}
 	if (!BLI_listbase_is_empty(&object->constraints)) {
 		BKE_object_eval_constraints(eval_ctx, scene, object);
 	}
-	BKE_object_eval_uber_transform(eval_ctx, scene, object);
+	BKE_object_eval_uber_transform(eval_ctx, object);
 	BKE_object_eval_done(eval_ctx, object);
 }
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index c4150e8af7a..7e437d97b57 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@ -437,7 +437,7 @@ void DepsgraphNodeBuilder::build_object_transform(Object *object)
 
 	/* local transforms (from transform channels - loc/rot/scale + deltas) */
 	op_node = add_operation_node(&object->id, DEG_NODE_TYPE_TRANSFORM,
-	                             function_bind(BKE_object_eval_local_transform, _1, scene_, object),
+	                             function_bind(BKE_object_eval_local_transform, _1, object),
 	                             DEG_OPCODE_TRANSFORM_LOCAL);
 	op_node->set_as_entry();
 
@@ -461,7 +461,7 @@ void DepsgraphNodeBuilder::build_object_transform(Object *object)
 	 * TODO(sergey): Get rid of this node.
 	 */
 	add_operation_node(&object->id, DEG_NODE_TYPE_TRANSFORM,
-	                   function_bind(BKE_object_eval_uber_transform, _1, scene_, object),
+	                   function_bind(BKE_object_eval_uber_transform, _1, object),
 	                   DEG_OPCODE_TRANSFORM_OBJECT_UBEREVAL);
 
 	/* object transform is done */