[Bf-blender-cvs] [9f55beb9712] master: Cleanup: Make it obvious which relations are used

Sergey Sharybin noreply at git.blender.org
Fri Mar 29 10:22:13 CET 2019


Commit: 9f55beb971297cd3fcfd043bf4a0b5d2a5742398
Author: Sergey Sharybin
Date:   Fri Mar 29 10:21:36 2019 +0100
Branches: master
https://developer.blender.org/rB9f55beb971297cd3fcfd043bf4a0b5d2a5742398

Cleanup: Make it obvious which relations are used

Relation in dependency graph is something else. So make it clear
that those are the effector ones.

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

M	source/blender/depsgraph/intern/builder/deg_builder_relations.cc

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

diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index f0c1dc8ffc3..dd8dc537c30 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -1732,10 +1732,11 @@ void DepsgraphRelationBuilder::build_rigidbody(Scene *scene)
 	 * initialized.
 	 * TODO(sergey): Verify that it indeed goes to initialization and not to a
 	 * simulation. */
-	ListBase *relations = build_effector_relations(graph_, rbw->effector_weights->group);
-	LISTBASE_FOREACH (EffectorRelation *, relation, relations) {
+	ListBase *effector_relations =
+	        build_effector_relations(graph_, rbw->effector_weights->group);
+	LISTBASE_FOREACH (EffectorRelation *, effector_relation, effector_relations) {
 		ComponentKey effector_transform_key(
-		        &relation->ob->id, NodeType::TRANSFORM);
+		        &effector_relation->ob->id, NodeType::TRANSFORM);
 		add_relation(effector_transform_key, rb_init_key, "RigidBody Field");
 	}
 	/* Objects. */



More information about the Bf-blender-cvs mailing list