Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 22 Feb 2018 13:08:27 +0000 (14:08 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 22 Feb 2018 13:08:27 +0000 (14:08 +0100)
1  2 
source/blender/blenkernel/BKE_modifier.h
source/blender/depsgraph/intern/builder/deg_builder_relations.cc

index 325596f54fe8724bee903735103d7b53de46f2e8,0d85b1dfc936eade96f31f38f44f27973807c1ab..f9d0349a5dcefb30840fc52fdea383e279a11b40
@@@ -1626,24 -1534,12 +1626,23 @@@ void DepsgraphRelationBuilder::build_ob
        /* link components to each other */
        add_relation(obdata_geom_key, geom_key, "Object Geometry Base Data");
  
 +      OperationKey obdata_ubereval_key(&object->id,
 +                                       DEG_NODE_TYPE_GEOMETRY,
 +                                       DEG_OPCODE_GEOMETRY_UBEREVAL);
 +
 +      /* Special case: modifiers and DerivedMesh creation queries scene for various
 +       * things like data mask to be used. We add relation here to ensure object is
 +       * never evaluated prior to Scene's CoW is ready.
 +       */
 +      OperationKey scene_key(&scene_->id,
 +                             DEG_NODE_TYPE_PARAMETERS,
 +                             DEG_OPCODE_PLACEHOLDER,
 +                             "Scene Eval");
 +      add_relation(scene_key, obdata_ubereval_key, "CoW Relation");
 +
        /* Modifiers */
        if (object->modifiers.first != NULL) {
 -              OperationKey obdata_ubereval_key(&object->id,
 -                                               DEG_NODE_TYPE_GEOMETRY,
 -                                               DEG_OPCODE_GEOMETRY_UBEREVAL);
                ModifierUpdateDepsgraphContext ctx = {};
-               ctx.bmain = bmain_;
                ctx.scene = scene_;
                ctx.object = object;