diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-20 20:05:51 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-20 20:05:51 +0400 |
| commit | 8eb41f0fdb77062d5828dd2c3e18ffeab5fd428c (patch) | |
| tree | 1b81bf423db957bf39dc01521533f8a0872842d0 /source/blender/blenkernel/intern/particle_system.c | |
| parent | 3c8d86e117b54914524cbc49a8678ecaad8671cf (diff) | |
| parent | f1eb66aa68105ac27f371f4f708d8abf3b7da38b (diff) | |
svn merge ^/trunk/blender -r41998:42009
Diffstat (limited to 'source/blender/blenkernel/intern/particle_system.c')
| -rw-r--r-- | source/blender/blenkernel/intern/particle_system.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index 3f127c7656b..3c5674f0b0f 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -3936,9 +3936,10 @@ static void particles_fluid_step(ParticleSimulationData *sim, int UNUSED(cfra)) // return; // ok, start loading - BLI_snprintf(filename, sizeof(filename), "%sfluidsurface_particles_####.gz", fss->surfdataPath); - - BLI_path_abs(filename, G.main->name); + BLI_join_dirfile(filename, sizeof(filename), fss->surfdataPath, OB_FLUIDSIM_SURF_PARTICLES_FNAME); + + BLI_path_abs(filename, modifier_path_relbase(sim->ob)); + BLI_path_frame(filename, curFrame, 0); // fixed #frame-no gzf = gzopen(filename, "rb"); |