Merge branch 'master' into blender2.8

2018-04-16 18:22:43 +02:00
parent 292a2802ad eb6fe5fa94
commit 49ee1a97d2
8 changed files with 32 additions and 24 deletions
--- a/source/blender/blenkernel/intern/softbody.c
+++ b/source/blender/blenkernel/intern/softbody.c
@@ -3699,7 +3699,8 @@ void sbObjectStep(const struct EvaluationContext *eval_ctx, Scene *scene, Object
 	cache_result = BKE_ptcache_read(&pid, (float)framenr+scene->r.subframe, can_simulate);

 	if (cache_result == PTCACHE_READ_EXACT || cache_result == PTCACHE_READ_INTERPOLATED ||
-	    (!can_simulate && cache_result == PTCACHE_READ_OLD)) {
+	    (!can_simulate && cache_result == PTCACHE_READ_OLD))
+	{
 		softbody_to_object(ob, vertexCos, numVerts, sb->local);

 		BKE_ptcache_validate(cache, framenr);