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

Depsgraph: Cleanup, indentation

Browse Source
This commit is contained in:
Sergey Sharybin
2017-06-14 12:01:52 +02:00
parent 20e5052a72
commit 481cf2982b
2 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -436,8 +436,8 @@ void DepsgraphNodeBuilder::build_object_transform(Scene *scene, Object *ob)
/* local transforms (from transform channels - loc/rot/scale + deltas) */ /* local transforms (from transform channels - loc/rot/scale + deltas) */
op_node = add_operation_node(&ob->id, DEG_NODE_TYPE_TRANSFORM, op_node = add_operation_node(&ob->id, DEG_NODE_TYPE_TRANSFORM,
function_bind(BKE_object_eval_local_transform, _1, scene, ob), function_bind(BKE_object_eval_local_transform, _1, scene, ob),
DEG_OPCODE_TRANSFORM_LOCAL); DEG_OPCODE_TRANSFORM_LOCAL);
op_node->set_as_entry(); op_node->set_as_entry();
/* object parent */ /* object parent */
@@ -730,10 +730,10 @@ void DepsgraphNodeBuilder::build_obdata_geom(Scene *scene, Object *ob)
* Does this depend on other nodes? * Does this depend on other nodes?
*/ */
op_node = add_operation_node(&ob->id, op_node = add_operation_node(&ob->id,
DEG_NODE_TYPE_PARAMETERS, DEG_NODE_TYPE_PARAMETERS,
NULL, NULL,
DEG_OPCODE_PLACEHOLDER, DEG_OPCODE_PLACEHOLDER,
"Parameters Eval"); "Parameters Eval");
op_node->set_as_exit(); op_node->set_as_exit();
/* Temporary uber-update node, which does everything. /* Temporary uber-update node, which does everything.
@@ -744,16 +744,16 @@ void DepsgraphNodeBuilder::build_obdata_geom(Scene *scene, Object *ob)
* TODO(sergey): Get rid of this node. * TODO(sergey): Get rid of this node.
*/ */
op_node = add_operation_node(&ob->id, op_node = add_operation_node(&ob->id,
DEG_NODE_TYPE_GEOMETRY, DEG_NODE_TYPE_GEOMETRY,
function_bind(BKE_object_eval_uber_data, _1, scene, ob), function_bind(BKE_object_eval_uber_data, _1, scene, ob),
DEG_OPCODE_GEOMETRY_UBEREVAL); DEG_OPCODE_GEOMETRY_UBEREVAL);
op_node->set_as_exit(); op_node->set_as_exit();
op_node = add_operation_node(&ob->id, op_node = add_operation_node(&ob->id,
DEG_NODE_TYPE_GEOMETRY, DEG_NODE_TYPE_GEOMETRY,
NULL, NULL,
DEG_OPCODE_PLACEHOLDER, DEG_OPCODE_PLACEHOLDER,
"Eval Init"); "Eval Init");
op_node->set_as_entry(); op_node->set_as_entry();
// TODO: "Done" operation // TODO: "Done" operation
@@ -800,12 +800,12 @@ void DepsgraphNodeBuilder::build_obdata_geom(Scene *scene, Object *ob)
/* evaluation operations */ /* evaluation operations */
op_node = add_operation_node(obdata, op_node = add_operation_node(obdata,
DEG_NODE_TYPE_GEOMETRY, DEG_NODE_TYPE_GEOMETRY,
function_bind(BKE_mesh_eval_geometry, function_bind(BKE_mesh_eval_geometry,
_1, _1,
(Mesh *)obdata), (Mesh *)obdata),
DEG_OPCODE_PLACEHOLDER, DEG_OPCODE_PLACEHOLDER,
"Geometry Eval"); "Geometry Eval");
op_node->set_as_entry(); op_node->set_as_entry();
break; break;
} }
@@ -819,12 +819,12 @@ void DepsgraphNodeBuilder::build_obdata_geom(Scene *scene, Object *ob)
/* metaball evaluation operations */ /* metaball evaluation operations */
/* NOTE: only the motherball gets evaluated! */ /* NOTE: only the motherball gets evaluated! */
op_node = add_operation_node(obdata, op_node = add_operation_node(obdata,
DEG_NODE_TYPE_GEOMETRY, DEG_NODE_TYPE_GEOMETRY,
function_bind(BKE_mball_eval_geometry, function_bind(BKE_mball_eval_geometry,
_1, _1,
(MetaBall *)obdata), (MetaBall *)obdata),
DEG_OPCODE_PLACEHOLDER, DEG_OPCODE_PLACEHOLDER,
"Geometry Eval"); "Geometry Eval");
op_node->set_as_entry(); op_node->set_as_entry();
} }
break; break;
@@ -837,12 +837,12 @@ void DepsgraphNodeBuilder::build_obdata_geom(Scene *scene, Object *ob)
/* Curve/nurms evaluation operations. */ /* Curve/nurms evaluation operations. */
/* - calculate curve geometry (including path) */ /* - calculate curve geometry (including path) */
op_node = add_operation_node(obdata, op_node = add_operation_node(obdata,
DEG_NODE_TYPE_GEOMETRY, DEG_NODE_TYPE_GEOMETRY,
function_bind(BKE_curve_eval_geometry, function_bind(BKE_curve_eval_geometry,
_1, _1,
(Curve *)obdata), (Curve *)obdata),
DEG_OPCODE_PLACEHOLDER, DEG_OPCODE_PLACEHOLDER,
"Geometry Eval"); "Geometry Eval");
op_node->set_as_entry(); op_node->set_as_entry();
/* Calculate curve path - this is used by constraints, etc. */ /* Calculate curve path - this is used by constraints, etc. */
@@ -876,12 +876,12 @@ void DepsgraphNodeBuilder::build_obdata_geom(Scene *scene, Object *ob)
{ {
/* Lattice evaluation operations. */ /* Lattice evaluation operations. */
op_node = add_operation_node(obdata, op_node = add_operation_node(obdata,
DEG_NODE_TYPE_GEOMETRY, DEG_NODE_TYPE_GEOMETRY,
function_bind(BKE_lattice_eval_geometry, function_bind(BKE_lattice_eval_geometry,
_1, _1,
(Lattice *)obdata), (Lattice *)obdata),
DEG_OPCODE_PLACEHOLDER, DEG_OPCODE_PLACEHOLDER,
"Geometry Eval"); "Geometry Eval");
op_node->set_as_entry(); op_node->set_as_entry();
break; break;
} }
@@ -958,7 +958,7 @@ void DepsgraphNodeBuilder::build_nodetree(bNodeTree *ntree)
/* Parameters for drivers. */ /* Parameters for drivers. */
op_node = add_operation_node(ntree_id, DEG_NODE_TYPE_PARAMETERS, NULL, op_node = add_operation_node(ntree_id, DEG_NODE_TYPE_PARAMETERS, NULL,
DEG_OPCODE_PLACEHOLDER, "Parameters Eval"); DEG_OPCODE_PLACEHOLDER, "Parameters Eval");
op_node->set_as_exit(); op_node->set_as_exit();
/* nodetree's nodes... */ /* nodetree's nodes... */

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

@@ -255,9 +255,9 @@ void DepsgraphNodeBuilder::build_proxy_rig(Object *ob)
} }
op_node = add_operation_node(&ob->id, op_node = add_operation_node(&ob->id,
DEG_NODE_TYPE_EVAL_POSE, DEG_NODE_TYPE_EVAL_POSE,
function_bind(BKE_pose_eval_proxy_copy, _1, ob), function_bind(BKE_pose_eval_proxy_copy, _1, ob),
DEG_OPCODE_POSE_INIT); DEG_OPCODE_POSE_INIT);
op_node->set_as_entry(); op_node->set_as_entry();
LINKLIST_FOREACH (bPoseChannel *, pchan, &ob->pose->chanbase) { LINKLIST_FOREACH (bPoseChannel *, pchan, &ob->pose->chanbase) {