diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-31 17:44:05 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-31 17:44:05 +0300 |
| commit | da11e33b26b6579ef36c97de1b6fbc0eb02a0b69 (patch) | |
| tree | da13c4b1971e26c0659c2dd218eeb6f42887178a /source/blender/depsgraph | |
| parent | 16100f8261770e367b0892bb38c778699ed609fe (diff) | |
Cleanup: remove G.main from BKE mball code.
Diffstat (limited to 'source/blender/depsgraph')
| -rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_nodes.cc | 2 | ||||
| -rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_relations.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc index 3a4ca7515a3..c646d7c20ff 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc @@ -838,7 +838,7 @@ void DepsgraphNodeBuilder::build_obdata_geom(Object *object) case OB_MBALL: { - Object *mom = BKE_mball_basis_find(scene_, object); + Object *mom = BKE_mball_basis_find(bmain_->eval_ctx, scene_, object); /* NOTE: Only the motherball gets evaluated, it's children are * having empty placeholders for the correct relations being built. */ diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc index 2d1e1f289ea..3628eede210 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc @@ -1612,7 +1612,7 @@ void DepsgraphRelationBuilder::build_obdata_geom(Object *object) case OB_MBALL: { - Object *mom = BKE_mball_basis_find(scene_, object); + Object *mom = BKE_mball_basis_find(bmain_->eval_ctx, scene_, object); ComponentKey mom_geom_key(&mom->id, DEG_NODE_TYPE_GEOMETRY); /* motherball - mom depends on children! */ if (mom == object) { |