diff options
| -rw-r--r-- | source/blender/blenkernel/BKE_mball.h | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/mball.c | 5 | ||||
| -rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_nodes.cc | 29 |
3 files changed, 6 insertions, 30 deletions
diff --git a/source/blender/blenkernel/BKE_mball.h b/source/blender/blenkernel/BKE_mball.h index 41f04c09e69..74ef9d9dbc0 100644 --- a/source/blender/blenkernel/BKE_mball.h +++ b/source/blender/blenkernel/BKE_mball.h @@ -76,8 +76,6 @@ void BKE_mball_select_swap(struct MetaBall *mb); struct Depsgraph; -void BKE_mball_eval_geometry(struct Depsgraph *depsgraph, - struct MetaBall *mball); /* Draw Cache */ enum { diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c index 339e79f2757..3afaf2d569e 100644 --- a/source/blender/blenkernel/intern/mball.c +++ b/source/blender/blenkernel/intern/mball.c @@ -563,11 +563,6 @@ void BKE_mball_select_swap(struct MetaBall *mb) /* **** Depsgraph evaluation **** */ -void BKE_mball_eval_geometry(struct Depsgraph *UNUSED(depsgraph), - MetaBall *UNUSED(mball)) -{ -} - /* Draw Engine */ void (*BKE_mball_batch_cache_dirty_cb)(MetaBall *mb, int mode) = NULL; diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc index f01baed06c3..73bacbc6192 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc @@ -1077,29 +1077,12 @@ void DepsgraphNodeBuilder::build_obdata_geom(Object *object) case OB_MBALL: { - Object *mom = BKE_mball_basis_find(scene_, object); - /* NOTE: Only the motherball gets evaluated, it's children are - * having empty placeholders for the correct relations being built. - */ - if (mom == object) { - /* metaball evaluation operations */ - op_node = add_operation_node(obdata, - DEG_NODE_TYPE_GEOMETRY, - function_bind( - BKE_mball_eval_geometry, - _1, - (MetaBall *)obdata_cow), - DEG_OPCODE_PLACEHOLDER, - "Geometry Eval"); - } - else { - op_node = add_operation_node(obdata, - DEG_NODE_TYPE_GEOMETRY, - NULL, - DEG_OPCODE_PLACEHOLDER, - "Geometry Eval"); - op_node->set_as_entry(); - } + op_node = add_operation_node(obdata, + DEG_NODE_TYPE_GEOMETRY, + NULL, + DEG_OPCODE_PLACEHOLDER, + "Geometry Eval"); + op_node->set_as_entry(); break; } |