Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Leung <aligorith@gmail.com>2018-08-21 06:22:59 +0300
committerJoshua Leung <aligorith@gmail.com>2018-08-21 07:52:10 +0300
commit351d13194d5e5c27278885fc6a7c5faaddd37e08 (patch)
tree55380684ede89a5eae2a722c2955a74d5a40bac1 /source/blender/depsgraph/intern/depsgraph_query_foreach.cc
parenta7dcad2f8ff01490436ff2fd0e2aa671a1e2fa90 (diff)
Cleanup: Fix variable shadowing
Diffstat (limited to 'source/blender/depsgraph/intern/depsgraph_query_foreach.cc')
-rw-r--r--source/blender/depsgraph/intern/depsgraph_query_foreach.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/depsgraph/intern/depsgraph_query_foreach.cc b/source/blender/depsgraph/intern/depsgraph_query_foreach.cc
index b5ed3e38f09..5fb6a01d894 100644
--- a/source/blender/depsgraph/intern/depsgraph_query_foreach.cc
+++ b/source/blender/depsgraph/intern/depsgraph_query_foreach.cc
@@ -77,8 +77,8 @@ static void deg_foreach_dependent_ID(const Depsgraph *graph,
void *user_data)
{
/* Start with getting ID node from the graph. */
- IDDepsNode *id_node = graph->find_id_node(id);
- if (id_node == NULL) {
+ IDDepsNode *target_id_node = graph->find_id_node(id);
+ if (target_id_node == NULL) {
/* TODO(sergey): Shall we inform or assert here about attempt to start
* iterating over non-existing ID?
*/
@@ -88,7 +88,7 @@ static void deg_foreach_dependent_ID(const Depsgraph *graph,
deg_foreach_clear_flags(graph);
/* Start with scheduling all operations from ID node. */
TraversalQueue queue;
- GHASH_FOREACH_BEGIN(ComponentDepsNode *, comp_node, id_node->components)
+ GHASH_FOREACH_BEGIN(ComponentDepsNode *, comp_node, target_id_node->components)
{
foreach (OperationDepsNode *op_node, comp_node->operations) {
queue.push_back(op_node);
@@ -96,7 +96,7 @@ static void deg_foreach_dependent_ID(const Depsgraph *graph,
}
}
GHASH_FOREACH_END();
- id_node->done = true;
+ target_id_node->done = true;
/* Process the queue. */
while (!queue.empty()) {
/* get next operation node to process. */