Merge remote-tracking branch 'origin/master' into blender2.8
authorDalai Felinto <dfelinto@gmail.com>
Mon, 13 Nov 2017 13:48:48 +0000 (11:48 -0200)
committerDalai Felinto <dfelinto@gmail.com>
Mon, 13 Nov 2017 13:48:48 +0000 (11:48 -0200)
1  2 
intern/cycles/device/device_cuda.cpp
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/editors/space_image/image_ops.c
source/blender/makesrna/intern/rna_scene.c
source/blender/python/bmesh/bmesh_py_types_meshdata.c

Simple merge
index 2c0aa951ffad0ab9f04d6d77033d5eb31551c969,35bb24cc6aa027bfb139b277f5ac01297688f16d..3e7ea039cad97e0c3e5db8850b4967ea07284f7f
@@@ -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;