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:
authorSebastian Parborg <darkdefende@gmail.com>2020-09-04 21:59:13 +0300
committerSebastian Parborg <darkdefende@gmail.com>2020-09-04 22:04:16 +0300
commit2115232a16d81d28dbdb8042ed8e9316858514c6 (patch)
tree1aeb7354a85b21b43a3ede7bf2980c172d4eec82 /source/blender/depsgraph
parente43d482cc93c64d55b1f58178db68551077e6560 (diff)
Cleanup: Clang-Tidy readability-inconsistent-declaration-parameter-name fix
No functional changes
Diffstat (limited to 'source/blender/depsgraph')
-rw-r--r--source/blender/depsgraph/DEG_depsgraph_debug.h4
-rw-r--r--source/blender/depsgraph/intern/builder/deg_builder_nodes.cc8
-rw-r--r--source/blender/depsgraph/intern/builder/deg_builder_relations.h2
-rw-r--r--source/blender/depsgraph/intern/debug/deg_debug_relations_graphviz.cc4
-rw-r--r--source/blender/depsgraph/intern/debug/deg_debug_stats_gnuplot.cc4
5 files changed, 11 insertions, 11 deletions
diff --git a/source/blender/depsgraph/DEG_depsgraph_debug.h b/source/blender/depsgraph/DEG_depsgraph_debug.h
index e261ff67a20..2aea10fd5b4 100644
--- a/source/blender/depsgraph/DEG_depsgraph_debug.h
+++ b/source/blender/depsgraph/DEG_depsgraph_debug.h
@@ -55,10 +55,10 @@ void DEG_stats_simple(const struct Depsgraph *graph,
/* ************************************************ */
/* Diagram-Based Graph Debugging */
-void DEG_debug_relations_graphviz(const struct Depsgraph *graph, FILE *stream, const char *label);
+void DEG_debug_relations_graphviz(const struct Depsgraph *graph, FILE *fp, const char *label);
void DEG_debug_stats_gnuplot(const struct Depsgraph *graph,
- FILE *stream,
+ FILE *fp,
const char *label,
const char *output_filename);
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index 6776f4b7b83..c245c67d1cd 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@ -701,20 +701,20 @@ void DepsgraphNodeBuilder::build_object_flags(int base_index,
is_from_set));
}
-void DepsgraphNodeBuilder::build_object_proxy_from(Object *object, bool is_visible)
+void DepsgraphNodeBuilder::build_object_proxy_from(Object *object, bool is_object_visible)
{
if (object->proxy_from == nullptr) {
return;
}
- build_object(-1, object->proxy_from, DEG_ID_LINKED_INDIRECTLY, is_visible);
+ build_object(-1, object->proxy_from, DEG_ID_LINKED_INDIRECTLY, is_object_visible);
}
-void DepsgraphNodeBuilder::build_object_proxy_group(Object *object, bool is_visible)
+void DepsgraphNodeBuilder::build_object_proxy_group(Object *object, bool is_object_visible)
{
if (object->proxy_group == nullptr) {
return;
}
- build_object(-1, object->proxy_group, DEG_ID_LINKED_INDIRECTLY, is_visible);
+ build_object(-1, object->proxy_group, DEG_ID_LINKED_INDIRECTLY, is_object_visible);
}
void DepsgraphNodeBuilder::build_object_instance_collection(Object *object, bool is_object_visible)
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.h b/source/blender/depsgraph/intern/builder/deg_builder_relations.h
index 04f2a3f911d..39768b9fdb6 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.h
@@ -195,7 +195,7 @@ class DepsgraphRelationBuilder : public DepsgraphBuilder {
void add_modifier_to_transform_relation(const DepsNodeHandle *handle, const char *description);
void add_customdata_mask(Object *object, const DEGCustomDataMeshMasks &customdata_masks);
- void add_special_eval_flag(ID *object, uint32_t flag);
+ void add_special_eval_flag(ID *id, uint32_t flag);
virtual void build_id(ID *id);
diff --git a/source/blender/depsgraph/intern/debug/deg_debug_relations_graphviz.cc b/source/blender/depsgraph/intern/debug/deg_debug_relations_graphviz.cc
index d0356f44022..04b25a36d6d 100644
--- a/source/blender/depsgraph/intern/debug/deg_debug_relations_graphviz.cc
+++ b/source/blender/depsgraph/intern/debug/deg_debug_relations_graphviz.cc
@@ -513,7 +513,7 @@ static void deg_debug_graphviz_graph_relations(DotExportContext &ctx, const Deps
} // namespace deg
} // namespace blender
-void DEG_debug_relations_graphviz(const Depsgraph *graph, FILE *f, const char *label)
+void DEG_debug_relations_graphviz(const Depsgraph *graph, FILE *fp, const char *label)
{
if (!graph) {
return;
@@ -539,5 +539,5 @@ void DEG_debug_relations_graphviz(const Depsgraph *graph, FILE *f, const char *l
deg::deg_debug_graphviz_legend(ctx);
std::string dot_string = digraph.to_dot_string();
- fprintf(f, "%s", dot_string.c_str());
+ fprintf(fp, "%s", dot_string.c_str());
}
diff --git a/source/blender/depsgraph/intern/debug/deg_debug_stats_gnuplot.cc b/source/blender/depsgraph/intern/debug/deg_debug_stats_gnuplot.cc
index 16bdc2d6115..98a2d09c352 100644
--- a/source/blender/depsgraph/intern/debug/deg_debug_stats_gnuplot.cc
+++ b/source/blender/depsgraph/intern/debug/deg_debug_stats_gnuplot.cc
@@ -153,7 +153,7 @@ void deg_debug_stats_gnuplot(const DebugContext &ctx)
} // namespace blender
void DEG_debug_stats_gnuplot(const Depsgraph *depsgraph,
- FILE *f,
+ FILE *fp,
const char *label,
const char *output_filename)
{
@@ -161,7 +161,7 @@ void DEG_debug_stats_gnuplot(const Depsgraph *depsgraph,
return;
}
deg::DebugContext ctx;
- ctx.file = f;
+ ctx.file = fp;
ctx.graph = (deg::Depsgraph *)depsgraph;
ctx.label = label;
ctx.output_filename = output_filename;