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:
authorNils Thuerey <nils@thuerey.de>2005-12-18 19:49:50 +0300
committerNils Thuerey <nils@thuerey.de>2005-12-18 19:49:50 +0300
commit6f422a749ae8689d95cb8587f828553ef8811223 (patch)
treebebf1f878e8473f9f116c42a06b770160b9565f5
parentf98851f32c61d6b1cd83e6229396d7244d37c880 (diff)
- yet another minor fluidsim fix - when using a start frame != 1
the scene is now exported at that time, still numbering and reading the files from zero to noFrames
-rw-r--r--source/blender/blenkernel/intern/DerivedMesh.c2
-rw-r--r--source/blender/src/fluidsim.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 04c4d180927..89cd78fb37a 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -2268,7 +2268,7 @@ void loadFluidsimMesh(Object *srcob, int useRenderParams)
float *bbStart = NULL, *bbSize = NULL;
float lastBB[3];
int displaymode = 0;
- int curFrame = G.scene->r.cfra - 1; /* start with 0 */
+ int curFrame = G.scene->r.cfra - G.scene->r.sfra; /* start with 0 at start frame */
char targetDir[FILE_MAXFILE+FILE_MAXDIR], targetFile[FILE_MAXFILE+FILE_MAXDIR];
char debugStrBuffer[256];
//snprintf(debugStrBuffer,256,"loadFluidsimMesh call (obid '%s', rp %d)\n", srcob->id.name, useRenderParams); // debug
diff --git a/source/blender/src/fluidsim.c b/source/blender/src/fluidsim.c
index 69f32767c66..cc9f240ef94 100644
--- a/source/blender/src/fluidsim.c
+++ b/source/blender/src/fluidsim.c
@@ -400,7 +400,7 @@ void fluidsimBake(struct Object *ob)
}
// dump data for frame 0
- G.scene->r.cfra = 1;
+ G.scene->r.cfra = G.scene->r.sfra;
scene_update_for_newframe(G.scene, G.scene->lay);
// start writing