diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2017-11-15 12:07:27 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2017-11-15 12:07:27 +0300 |
commit | 258292abc0252360e19654db454c7ef8bd2b63fe (patch) | |
tree | a91e836a47c6db4124af720b8def30dcfcfd8710 /source | |
parent | 7549b10212ba761a4f19be224b1d95df993ca4ef (diff) | |
parent | d8066fb0f145395594d0a952a4c0f70206dc0214 (diff) |
Merge commit '212a8d9e5ae7^' into blender2.8
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_relations.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc index 6e806089736..f5fbb28a093 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc @@ -1676,7 +1676,7 @@ void DepsgraphRelationBuilder::build_obdata_geom(Object *ob) mom_geom_key, "Metaball Motherball Transform -> Geometry"); } - else if (mom != ob) { + else { ComponentKey transform_key(&ob->id, DEG_NODE_TYPE_TRANSFORM); add_relation(geom_key, mom_geom_key, "Metaball Motherball"); add_relation(transform_key, mom_geom_key, "Metaball Motherball"); |