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:
authorSergey Sharybin <sergey.vfx@gmail.com>2019-01-30 13:21:34 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2019-01-31 15:00:11 +0300
commit83ec5fbf8d0d0597a9b606f65eac0d2f374ff187 (patch)
treeb7c917458f91e7b8a3221cce906dff08519c9374 /source/blender
parent77eaa4790d370b5f8c3faa2ca65e8466a1259863 (diff)
Depsgraph: Use more clear name for enumerator
Matches enumerator items and type name.
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/depsgraph/intern/depsgraph_types.h4
-rw-r--r--source/blender/depsgraph/intern/nodes/deg_node.h3
-rw-r--r--source/blender/depsgraph/intern/nodes/deg_node_component.cc2
-rw-r--r--source/blender/depsgraph/intern/nodes/deg_node_component.h2
-rw-r--r--source/blender/depsgraph/intern/nodes/deg_node_id.cc2
-rw-r--r--source/blender/depsgraph/intern/nodes/deg_node_id.h2
-rw-r--r--source/blender/depsgraph/intern/nodes/deg_node_operation.cc2
-rw-r--r--source/blender/depsgraph/intern/nodes/deg_node_operation.h2
-rw-r--r--source/blender/depsgraph/intern/nodes/deg_node_time.cc3
-rw-r--r--source/blender/depsgraph/intern/nodes/deg_node_time.h2
10 files changed, 11 insertions, 13 deletions
diff --git a/source/blender/depsgraph/intern/depsgraph_types.h b/source/blender/depsgraph/intern/depsgraph_types.h
index 3910475f295..9e6b1260a4b 100644
--- a/source/blender/depsgraph/intern/depsgraph_types.h
+++ b/source/blender/depsgraph/intern/depsgraph_types.h
@@ -311,7 +311,7 @@ const char *operationCodeAsString(eDepsOperation_Code opcode);
*
* NOTE: This is a bit mask, so accumulation of sources is possible.
*/
-typedef enum eDepsTag_Source {
+typedef enum eUpdateSource {
/* Update is caused by a time change. */
DEG_UPDATE_SOURCE_TIME = (1 << 0),
/* Update caused by user directly or indirectly influencing the node. */
@@ -320,6 +320,6 @@ typedef enum eDepsTag_Source {
DEG_UPDATE_SOURCE_RELATIONS = (1 << 2),
/* Update is happening due to visibility change. */
DEG_UPDATE_SOURCE_VISIBILITY = (1 << 3),
-} eDepsTag_Source;
+} eUpdateSource;
} // namespace DEG
diff --git a/source/blender/depsgraph/intern/nodes/deg_node.h b/source/blender/depsgraph/intern/nodes/deg_node.h
index 409fd83e3ac..ba5d9bebd9c 100644
--- a/source/blender/depsgraph/intern/nodes/deg_node.h
+++ b/source/blender/depsgraph/intern/nodes/deg_node.h
@@ -98,8 +98,7 @@ struct DepsNode {
virtual void init(const ID * /*id*/,
const char * /*subdata*/) {}
- virtual void tag_update(Depsgraph * /*graph*/,
- eDepsTag_Source /*source*/) {}
+ virtual void tag_update(Depsgraph * /*graph*/, eUpdateSource /*source*/) {}
virtual OperationDepsNode *get_entry_operation() { return NULL; }
virtual OperationDepsNode *get_exit_operation() { return NULL; }
diff --git a/source/blender/depsgraph/intern/nodes/deg_node_component.cc b/source/blender/depsgraph/intern/nodes/deg_node_component.cc
index 5eb8dc9dd09..5037513d1a2 100644
--- a/source/blender/depsgraph/intern/nodes/deg_node_component.cc
+++ b/source/blender/depsgraph/intern/nodes/deg_node_component.cc
@@ -283,7 +283,7 @@ void ComponentDepsNode::clear_operations()
operations.clear();
}
-void ComponentDepsNode::tag_update(Depsgraph *graph, eDepsTag_Source source)
+void ComponentDepsNode::tag_update(Depsgraph *graph, eUpdateSource source)
{
OperationDepsNode *entry_op = get_entry_operation();
if (entry_op != NULL && entry_op->flag & DEPSOP_FLAG_NEEDS_UPDATE) {
diff --git a/source/blender/depsgraph/intern/nodes/deg_node_component.h b/source/blender/depsgraph/intern/nodes/deg_node_component.h
index 5e1d97f6502..f767faaeef3 100644
--- a/source/blender/depsgraph/intern/nodes/deg_node_component.h
+++ b/source/blender/depsgraph/intern/nodes/deg_node_component.h
@@ -120,7 +120,7 @@ struct ComponentDepsNode : public DepsNode {
void clear_operations();
- virtual void tag_update(Depsgraph *graph, eDepsTag_Source source) override;
+ virtual void tag_update(Depsgraph *graph, eUpdateSource source) override;
virtual OperationDepsNode *get_entry_operation() override;
virtual OperationDepsNode *get_exit_operation() override;
diff --git a/source/blender/depsgraph/intern/nodes/deg_node_id.cc b/source/blender/depsgraph/intern/nodes/deg_node_id.cc
index d431e68f904..4d7e191cba9 100644
--- a/source/blender/depsgraph/intern/nodes/deg_node_id.cc
+++ b/source/blender/depsgraph/intern/nodes/deg_node_id.cc
@@ -207,7 +207,7 @@ ComponentDepsNode *IDDepsNode::add_component(eDepsNode_Type type,
return comp_node;
}
-void IDDepsNode::tag_update(Depsgraph *graph, eDepsTag_Source source)
+void IDDepsNode::tag_update(Depsgraph *graph, eUpdateSource source)
{
GHASH_FOREACH_BEGIN(ComponentDepsNode *, comp_node, components)
{
diff --git a/source/blender/depsgraph/intern/nodes/deg_node_id.h b/source/blender/depsgraph/intern/nodes/deg_node_id.h
index a968794e3b2..a0c5d2c2bd6 100644
--- a/source/blender/depsgraph/intern/nodes/deg_node_id.h
+++ b/source/blender/depsgraph/intern/nodes/deg_node_id.h
@@ -61,7 +61,7 @@ struct IDDepsNode : public DepsNode {
ComponentDepsNode *add_component(eDepsNode_Type type,
const char *name = "");
- virtual void tag_update(Depsgraph *graph, eDepsTag_Source source) override;
+ virtual void tag_update(Depsgraph *graph, eUpdateSource source) override;
void finalize_build(Depsgraph *graph);
diff --git a/source/blender/depsgraph/intern/nodes/deg_node_operation.cc b/source/blender/depsgraph/intern/nodes/deg_node_operation.cc
index f6fee6acf23..3ad7ee8d093 100644
--- a/source/blender/depsgraph/intern/nodes/deg_node_operation.cc
+++ b/source/blender/depsgraph/intern/nodes/deg_node_operation.cc
@@ -74,7 +74,7 @@ string OperationDepsNode::full_identifier() const
return owner_str + "." + identifier();
}
-void OperationDepsNode::tag_update(Depsgraph *graph, eDepsTag_Source source)
+void OperationDepsNode::tag_update(Depsgraph *graph, eUpdateSource source)
{
if ((flag & DEPSOP_FLAG_NEEDS_UPDATE) == 0) {
graph->add_entry_tag(this);
diff --git a/source/blender/depsgraph/intern/nodes/deg_node_operation.h b/source/blender/depsgraph/intern/nodes/deg_node_operation.h
index 578a0d2712b..d7a0fa34c80 100644
--- a/source/blender/depsgraph/intern/nodes/deg_node_operation.h
+++ b/source/blender/depsgraph/intern/nodes/deg_node_operation.h
@@ -61,7 +61,7 @@ struct OperationDepsNode : public DepsNode {
virtual string identifier() const override;
string full_identifier() const;
- virtual void tag_update(Depsgraph *graph, eDepsTag_Source source) override;
+ virtual void tag_update(Depsgraph *graph, eUpdateSource source) override;
bool is_noop() const { return (bool)evaluate == false; }
diff --git a/source/blender/depsgraph/intern/nodes/deg_node_time.cc b/source/blender/depsgraph/intern/nodes/deg_node_time.cc
index a788b999305..82f2c628b3e 100644
--- a/source/blender/depsgraph/intern/nodes/deg_node_time.cc
+++ b/source/blender/depsgraph/intern/nodes/deg_node_time.cc
@@ -37,8 +37,7 @@
namespace DEG {
-void TimeSourceDepsNode::tag_update(Depsgraph *graph,
- eDepsTag_Source /*source*/)
+void TimeSourceDepsNode::tag_update(Depsgraph *graph, eUpdateSource /*source*/)
{
foreach (DepsRelation *rel, outlinks) {
DepsNode *node = rel->to;
diff --git a/source/blender/depsgraph/intern/nodes/deg_node_time.h b/source/blender/depsgraph/intern/nodes/deg_node_time.h
index 7253dc106d4..392f4f3a95f 100644
--- a/source/blender/depsgraph/intern/nodes/deg_node_time.h
+++ b/source/blender/depsgraph/intern/nodes/deg_node_time.h
@@ -44,7 +44,7 @@ struct TimeSourceDepsNode : public DepsNode {
// TODO: evaluate() operation needed
- virtual void tag_update(Depsgraph *graph, eDepsTag_Source source) override;
+ virtual void tag_update(Depsgraph *graph, eUpdateSource source) override;
DEG_DEPSNODE_DECLARE;
};