Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Depsgraph: Use operation code for file cache update

Browse Source 
All done in separate commits, so it's easier to bisect just in case.
This commit is contained in:
Sergey Sharybin
2019-02-01 10:57:39 +01:00
parent 0d2dfd2e2d
commit b78f29b049
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
View File

@@ -1617,7 +1617,7 @@ void DepsgraphNodeBuilder::build_cachefile(CacheFile *cache_file)
build_animdata(cache_file_id); build_animdata(cache_file_id);
/* Cache evaluation itself. */ /* Cache evaluation itself. */
add_operation_node(cache_file_id, NodeType::CACHE, NULL, add_operation_node(cache_file_id, NodeType::CACHE, NULL,
OperationCode::PLACEHOLDER, "Cache File Update"); OperationCode::FILE_CACHE_UPDATE);
} }
void DepsgraphNodeBuilder::build_mask(Mask *mask) void DepsgraphNodeBuilder::build_mask(Mask *mask)

2
source/blender/depsgraph/intern/node/deg_node_operation.cc
View File

@@ -100,6 +100,8 @@ const char *operationCodeAsString(OperationCode opcode)
return "PARTICLE_SETTINGS_RESET"; return "PARTICLE_SETTINGS_RESET";
/* Point Cache. */ /* Point Cache. */
case OperationCode::POINT_CACHE_RESET: return "POINT_CACHE_RESET"; case OperationCode::POINT_CACHE_RESET: return "POINT_CACHE_RESET";
/* File cache. */
case OperationCode::FILE_CACHE_UPDATE: return "FILE_CACHE_UPDATE";
/* Batch cache. */ /* Batch cache. */
case OperationCode::GEOMETRY_SELECT_UPDATE: case OperationCode::GEOMETRY_SELECT_UPDATE:
return "GEOMETRY_SELECT_UPDATE"; return "GEOMETRY_SELECT_UPDATE";

3
source/blender/depsgraph/intern/node/deg_node_operation.h
View File

@@ -148,6 +148,9 @@ enum class OperationCode {
/* Point Cache. --------------------------------------------------------- */ /* Point Cache. --------------------------------------------------------- */
POINT_CACHE_RESET, POINT_CACHE_RESET,
/* File cache. ---------------------------------------------------------- */
FILE_CACHE_UPDATE,
/* Collections. --------------------------------------------------------- */ /* Collections. --------------------------------------------------------- */
VIEW_LAYER_EVAL, VIEW_LAYER_EVAL,