[Bf-blender-cvs] [b78f29b0497] master: Depsgraph: Use operation code for file cache update

[Sergey Sharybin]

Commit: b78f29b04977475010bbe29f918ab1b007e20ee6
Author: Sergey Sharybin
Date:   Fri Feb 1 10:57:39 2019 +0100
Branches: master
https://developer.blender.org/rBb78f29b04977475010bbe29f918ab1b007e20ee6

Depsgraph: Use operation code for file cache update

All done in separate commits, so it's easier to bisect just in case.

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

M       source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
M       source/blender/depsgraph/intern/node/deg_node_operation.cc
M       source/blender/depsgraph/intern/node/deg_node_operation.h

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

diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc 
b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index 2c213c7ec80..b0d06a30924 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@ -1617,7 +1617,7 @@ void DepsgraphNodeBuilder::build_cachefile(CacheFile 
*cache_file)
        build_animdata(cache_file_id);
        /* Cache evaluation itself. */
        add_operation_node(cache_file_id, NodeType::CACHE, NULL,
-                          OperationCode::PLACEHOLDER, "Cache File Update");
+                          OperationCode::FILE_CACHE_UPDATE);
 }
 
 void DepsgraphNodeBuilder::build_mask(Mask *mask)
diff --git a/source/blender/depsgraph/intern/node/deg_node_operation.cc 
b/source/blender/depsgraph/intern/node/deg_node_operation.cc
index b222253f555..a5066e233f0 100644
--- a/source/blender/depsgraph/intern/node/deg_node_operation.cc
+++ b/source/blender/depsgraph/intern/node/deg_node_operation.cc
@@ -100,6 +100,8 @@ const char *operationCodeAsString(OperationCode opcode)
                        return "PARTICLE_SETTINGS_RESET";
                /* Point Cache. */
                case OperationCode::POINT_CACHE_RESET: return 
"POINT_CACHE_RESET";
+               /* File cache. */
+               case OperationCode::FILE_CACHE_UPDATE: return 
"FILE_CACHE_UPDATE";
                /* Batch cache. */
                case OperationCode::GEOMETRY_SELECT_UPDATE:
                        return "GEOMETRY_SELECT_UPDATE";
diff --git a/source/blender/depsgraph/intern/node/deg_node_operation.h 
b/source/blender/depsgraph/intern/node/deg_node_operation.h
index 545290d9399..34236817736 100644
--- a/source/blender/depsgraph/intern/node/deg_node_operation.h
+++ b/source/blender/depsgraph/intern/node/deg_node_operation.h
@@ -148,6 +148,9 @@ enum class OperationCode {
        /* Point Cache. 
--------------------------------------------------------- */
        POINT_CACHE_RESET,
 
+       /* File cache. 
---------------------------------------------------------- */
+       FILE_CACHE_UPDATE,
+
        /* Collections. 
--------------------------------------------------------- */
        VIEW_LAYER_EVAL,

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs