Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-04-16 19:22:43 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-04-16 19:22:43 +0300
commit49ee1a97d2704d8cc707201675a919b9ef103fec (patch)
tree17c78db252f4b24297490de623fe5f303cea181a /source/blender/blenkernel/intern/cloth.c
parent292a2802ad376f4a3a2cc7bed763d0f5856dd98c (diff)
parenteb6fe5fa94b86a0a20742e06bf1e68b4cbaf6693 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/cloth.c')
-rw-r--r--source/blender/blenkernel/intern/cloth.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c
index 339dcc4a62e..e928dfaab37 100644
--- a/source/blender/blenkernel/intern/cloth.c
+++ b/source/blender/blenkernel/intern/cloth.c
@@ -458,7 +458,8 @@ void clothModifier_do(ClothModifierData *clmd, const struct EvaluationContext *e
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))
+ {
BKE_cloth_solver_set_positions(clmd);
cloth_to_object (ob, clmd, vertexCos);