[Bf-blender-cvs] [79f94674fb] blender2.8: Merge branch 'master' into blender2.8

Sergey Sharybin noreply at git.blender.org
Wed Mar 15 12:48:56 CET 2017


Commit: 79f94674fb2f7fbc08927cc50809b63db4174d17
Author: Sergey Sharybin
Date:   Wed Mar 15 12:48:48 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB79f94674fb2f7fbc08927cc50809b63db4174d17

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/blenkernel/intern/object_update.c
index 8345f1a4c4,a531466294..c85a91cad6
--- a/source/blender/blenkernel/intern/object_update.c
+++ b/source/blender/blenkernel/intern/object_update.c
@@@ -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);
+ }




More information about the Bf-blender-cvs mailing list