Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 21 Mar 2018 11:47:13 +0000 (12:47 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 21 Mar 2018 11:47:13 +0000 (12:47 +0100)
1  2 
release/scripts/startup/bl_operators/clip.py
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc

index 80daa306bffd9638013793d6b97ef6eed386f6fb,15e3ea3e10f88ab763f1092ab0de2dbfe64f69aa..b7d07d5c7eff7124a42b78bcbdc58977f0fc1b7d
@@@ -981,21 -747,9 +986,10 @@@ void DepsgraphNodeBuilder::build_shapek
  // XXX: what happens if the datablock is shared!
  void DepsgraphNodeBuilder::build_obdata_geom(Object *object)
  {
 -      ID *obdata = (ID *)object->data;
        OperationDepsNode *op_node;
 +      Scene *scene_cow = get_cow_datablock(scene_);
 +      Object *object_cow = get_cow_datablock(object);
  
-       /* TODO(sergey): This way using this object's properties as driver target
-        * works fine.
-        *
-        * Does this depend on other nodes?
-        */
-       op_node = add_operation_node(&object->id,
-                                    DEG_NODE_TYPE_PARAMETERS,
-                                    NULL,
-                                    DEG_OPCODE_PARAMETERS_EVAL);
-       op_node->set_as_exit();
        /* Temporary uber-update node, which does everything.
         * It is for the being we're porting old dependencies into the new system.
         * We'll get rid of this node as soon as all the granular update functions