Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 15 Mar 2017 11:48:48 +0000 (12:48 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 15 Mar 2017 11:48:48 +0000 (12:48 +0100)
1  2 
source/blender/blenkernel/BKE_object.h
source/blender/blenkernel/intern/object_update.c
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
source/blender/depsgraph/intern/builder/deg_builder_nodes.h
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/depsgraph/intern/builder/deg_builder_relations.h
source/blenderplayer/bad_level_call_stubs/stubs.c

index 8345f1a4c4af783cfdf7d879e4df4876333c501b,a531466294e01dd23df8ca457ee3520ef050a9d7..c85a91cad6878b52d2aba3badfef8b303069d671
@@@ -342,9 -346,11 +343,15 @@@ void BKE_object_eval_uber_data(Evaluati
        BLI_assert(ob->type != OB_ARMATURE);
        BKE_object_handle_data_update(eval_ctx, scene, ob);
  
 +      if (ob->type == OB_MESH) {
 +              BKE_mesh_batch_cache_dirty(ob->data);
 +      }
 +
        ob->recalc &= ~(OB_RECALC_DATA | OB_RECALC_TIME);
  }
+ void BKE_object_eval_cloth(EvaluationContext *UNUSED(eval_ctx), Scene *scene, Object *object)
+ {
+       DEBUG_PRINT("%s on %s\n", __func__, object->id.name);
+       BKE_ptcache_object_reset(scene, object, PTCACHE_RESET_DEPSGRAPH);
+ }