[Bf-blender-cvs] [1cb6cea71c1] blender2.8: Merge remote-tracking branch 'origin/master' into blender2.8

Dalai Felinto noreply at git.blender.org
Mon Nov 13 14:49:17 CET 2017


Commit: 1cb6cea71c10c0d22ba9cdd3eee5111d0734c193
Author: Dalai Felinto
Date:   Mon Nov 13 11:48:48 2017 -0200
Branches: blender2.8
https://developer.blender.org/rB1cb6cea71c10c0d22ba9cdd3eee5111d0734c193

Merge remote-tracking branch 'origin/master' into blender2.8

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



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

diff --cc source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index 2c0aa951ffa,35bb24cc6aa..3e7ea039cad
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@@ -987,18 -813,24 +987,25 @@@ void DepsgraphNodeBuilder::build_obdata
  		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,
 -				                                           _1,
 -				                                           (MetaBall *)obdata),
 +				                             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();
  			}
  			break;



More information about the Bf-blender-cvs mailing list