diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-11 13:14:18 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-11 13:15:14 +0300 |
| commit | d0956e9cb3077971a9ae6c1ba9560604d5ad1ef7 (patch) | |
| tree | 0dea964abf85748db7ab15a2feee1a41bf6ec52c /source/blender/depsgraph | |
| parent | 8055ed2741d1da48f2bf84c75ccb37b54cef1ab8 (diff) | |
Cleanup: Moar G.main removal of Hell.
This commit actually adds some G.main... but at much, much higher level
than the ones it removes, so should still be better ;)
Diffstat (limited to 'source/blender/depsgraph')
| -rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_nodes.cc | 3 | ||||
| -rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_relations.cc | 2 |
2 files changed, 3 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 c646d7c20ff..b0894101414 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc @@ -769,6 +769,7 @@ void DepsgraphNodeBuilder::build_obdata_geom(Object *object) op_node = add_operation_node(&object->id, DEG_NODE_TYPE_GEOMETRY, function_bind(BKE_object_eval_uber_data, + bmain_, _1, scene_, object), @@ -838,7 +839,7 @@ void DepsgraphNodeBuilder::build_obdata_geom(Object *object) case OB_MBALL: { - Object *mom = BKE_mball_basis_find(bmain_->eval_ctx, scene_, object); + Object *mom = BKE_mball_basis_find(bmain_, 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 3628eede210..e8adabb2668 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(bmain_->eval_ctx, scene_, object); + Object *mom = BKE_mball_basis_find(bmain_, bmain_->eval_ctx, scene_, object); ComponentKey mom_geom_key(&mom->id, DEG_NODE_TYPE_GEOMETRY); /* motherball - mom depends on children! */ if (mom == object) { |