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

Depsgraph: Use operation code for geometry evaluation done

Browse Source
This commit is contained in:
Sergey Sharybin
2019-02-01 10:42:50 +01:00
parent a86001c56a
commit c1cf4c29da
4 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1387,8 +1387,10 @@ void DepsgraphNodeBuilder::build_object_data_geometry_datablock(
BLI_assert(!"Should not happen");
break;
}
op_node = add_operation_node(obdata, NodeType::GEOMETRY, NULL,
OperationCode::PLACEHOLDER, "Eval Done");
op_node = add_operation_node(obdata,
NodeType::GEOMETRY,
NULL,
OperationCode::GEOMETRY_EVAL_DONE);
op_node->set_as_exit();
/* Parameters for driver sources. */
add_operation_node(obdata,

7
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
View File

@@ -2122,11 +2122,10 @@ void DepsgraphRelationBuilder::build_object_data_geometry_datablock(ID *obdata)
}
/* Link object data evaluation node to exit operation. */
OperationKey obdata_geom_eval_key(
obdata, NodeType::GEOMETRY, OperationCode::PLACEHOLDER);
obdata, NodeType::GEOMETRY, OperationCode::GEOMETRY_EVAL);
OperationKey obdata_geom_done_key(obdata,
NodeType::GEOMETRY,
OperationCode::PLACEHOLDER,
"Eval Done");
NodeType::GEOMETRY,
OperationCode::GEOMETRY_EVAL_DONE);
add_relation(obdata_geom_eval_key,
obdata_geom_done_key,
"ObData Geom Eval Done");

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

@@ -66,6 +66,7 @@ const char *operationCodeAsString(OperationCode opcode)
/* Geometry. */
case OperationCode::GEOMETRY_EVAL_INIT: return "GEOMETRY_EVAL_INIT";
case OperationCode::GEOMETRY_EVAL: return "GEOMETRY_EVAL";
case OperationCode::GEOMETRY_EVAL_DONE: return "GEOMETRY_EVAL_DONE";
case OperationCode::GEOMETRY_SHAPEKEY: return "GEOMETRY_SHAPEKEY";
/* Object data. */
case OperationCode::LIGHT_PROBE_EVAL: return "LIGHT_PROBE_EVAL";

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

@@ -89,7 +89,10 @@ enum class OperationCode {
GEOMETRY_EVAL_INIT,
/* Evaluate the whole geometry, including modifiers. */
GEOMETRY_EVAL,
/* Evaluation of a shape key. */
/* Evaluation of geometry is completely done.. */
GEOMETRY_EVAL_DONE,
/* Evaluation of a shape key.
* NOTE: Currently only for object data datablocks. */
GEOMETRY_SHAPEKEY,
/* Object data. --------------------------------------------------------- */