diff options
| author | Daniel Genrich <daniel.genrich@gmx.net> | 2008-01-30 05:05:37 +0300 |
|---|---|---|
| committer | Daniel Genrich <daniel.genrich@gmx.net> | 2008-01-30 05:05:37 +0300 |
| commit | 4ed28a99a70fdceb85e8e4f6972fc632cf192d79 (patch) | |
| tree | 865efbd6ec078bff123a055875ac53a748d08024 /source/blender/blenkernel/intern/cloth.c | |
| parent | 7a7a52226f52952534c93832c3e7b0492ec0ad30 (diff) | |
Cloth: Bugfix: 1. Kicking esc again, 2. Collision modifier needed to be updated when going backward in time, 3. GUI change when no bullet there
Diffstat (limited to 'source/blender/blenkernel/intern/cloth.c')
| -rw-r--r-- | source/blender/blenkernel/intern/cloth.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c index dac77381175..ace5f37b7a4 100644 --- a/source/blender/blenkernel/intern/cloth.c +++ b/source/blender/blenkernel/intern/cloth.c @@ -526,6 +526,9 @@ int cloth_read_cache(Object *ob, ClothModifierData *clmd, float framenr) if(G.rt > 0) printf("cloth_read_cache problem: lnex - f#: %f, lastCF: %d\n", framenr, clmd->sim_parms->lastcachedframe); } + + if(G.rt > 0) + printf("cloth_read_cache: %f successfully \n", framenr); } if(G.rt > 0) @@ -647,7 +650,7 @@ DerivedMesh *clothModifier_do(ClothModifierData *clmd,Object *ob, DerivedMesh *d /* we're getting called two times during file load, resulting in a not valid G.relbase on the first time (cache makes problems) --> just return back */ - if((clmd->sim_parms->flags & CLOTH_SIMSETTINGS_FLAG_LOADED)&& (!G.relbase_valid)) + if((clmd->sim_parms->flags & CLOTH_SIMSETTINGS_FLAG_LOADED) && (!G.relbase_valid)) { clmd->sim_parms->flags &= ~CLOTH_SIMSETTINGS_FLAG_LOADED; return dm; @@ -732,8 +735,6 @@ DerivedMesh *clothModifier_do(ClothModifierData *clmd,Object *ob, DerivedMesh *d // only be active during a specific period: // that's "first frame" and "last frame" on GUI - - // TODO: enable later again after refactoring if ( current_time < clmd->sim_parms->firstframe ) { return result; |