[Bf-blender-cvs] [8a03e4d409e] master: Depsgraph: Fix relations for metaballs

[Sergey Sharybin]

Commit: 8a03e4d409ec71beab612facf432eb57f3bc5f34
Author: Sergey Sharybin
Date:   Mon Nov 13 14:43:08 2017 +0100
Branches: master
https://developer.blender.org/rB8a03e4d409ec71beab612facf432eb57f3bc5f34

Depsgraph: Fix relations for metaballs

Initially spotted and investigated by Dalai and Germano.

===================================================================

M	source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
M	source/blender/depsgraph/intern/builder/deg_builder_relations.cc

===================================================================

diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index 7ac94141f39..35bb24cc6aa 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@ -813,10 +813,11 @@ void DepsgraphNodeBuilder::build_obdata_geom(Object *ob)
 		case OB_MBALL:
 		{
 			Object *mom = BKE_mball_basis_find(scene_, ob);
-			/* Motherball - mom depends on children! */
+			/* NOTE: Only the motherball gets evaluated, it's children are
+			 * having empty placeholders for the correct relations being built.
+			 */
 			if (mom == ob) {
 				/* metaball evaluation operations */
-				/* NOTE: only the motherball gets evaluated! */
 				op_node = add_operation_node(obdata,
 				                             DEG_NODE_TYPE_GEOMETRY,
 				                             function_bind(BKE_mball_eval_geometry,
@@ -824,6 +825,12 @@ void DepsgraphNodeBuilder::build_obdata_geom(Object *ob)
 				                                           (MetaBall *)obdata),
 				                             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();
 			}
 			break;
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index 3448525a50d..ce56901c52f 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -1572,13 +1572,19 @@ void DepsgraphRelationBuilder::build_obdata_geom(Object *ob)
 		case OB_MBALL:
 		{
 			Object *mom = BKE_mball_basis_find(scene_, ob);
+			ComponentKey mom_geom_key(&mom->id, DEG_NODE_TYPE_GEOMETRY);
 			/* motherball - mom depends on children! */
-			if (mom != ob) {
-				/* non-motherball -> cannot be directly evaluated! */
-				ComponentKey mom_key(&mom->id, DEG_NODE_TYPE_GEOMETRY);
+			if (mom == ob) {
+				ComponentKey mom_transform_key(&mom->id,
+				                               DEG_NODE_TYPE_TRANSFORM);
+				add_relation(mom_transform_key,
+				             mom_geom_key,
+				             "Metaball Motherball Transform -> Geometry");
+			}
+			else if (mom != ob) {
 				ComponentKey transform_key(&ob->id, DEG_NODE_TYPE_TRANSFORM);
-				add_relation(geom_key, mom_key, "Metaball Motherball");
-				add_relation(transform_key, mom_key, "Metaball Motherball");
+				add_relation(geom_key, mom_geom_key, "Metaball Motherball");
+				add_relation(transform_key, mom_geom_key, "Metaball Motherball");
 			}
 			break;
 		}