diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-29 12:24:58 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-29 13:48:12 +0300 |
| commit | 3733be8731df978ec50cd283ff24b813bdd89df1 (patch) | |
| tree | 8efde2ad409d4089437c2f4a524a0b1522805309 /source/blender/blenkernel/intern/particle_system.c | |
| parent | 3eff6f7a5ed5f04745b372625d0dc58f0a52be9a (diff) | |
Cleanup: nuke G.main from BKE's particle_system.c
Diffstat (limited to 'source/blender/blenkernel/intern/particle_system.c')
| -rw-r--r-- | source/blender/blenkernel/intern/particle_system.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index e8dbf95e286..8f94c7b3c8d 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -3814,7 +3814,7 @@ static void cached_step(ParticleSimulationData *sim, float cfra, const bool use_ } static void particles_fluid_step( - Main *bmain, ParticleSimulationData *sim, int UNUSED(cfra), const bool use_render_params) + ParticleSimulationData *sim, int UNUSED(cfra), const bool use_render_params) { ParticleSystem *psys = sim->psys; if (psys->particles) { @@ -3845,7 +3845,7 @@ static void particles_fluid_step( // ok, start loading BLI_join_dirfile(filename, sizeof(filename), fss->surfdataPath, OB_FLUIDSIM_SURF_PARTICLES_FNAME); - BLI_path_abs(filename, modifier_path_relbase(bmain, sim->ob)); + BLI_path_abs(filename, modifier_path_relbase_from_global(sim->ob)); BLI_path_frame(filename, curFrame, 0); // fixed #frame-no @@ -3919,7 +3919,7 @@ static void particles_fluid_step( } // fluid sim particles done } #else - UNUSED_VARS(bmain, use_render_params); + UNUSED_VARS(use_render_params); #endif // WITH_MOD_FLUID } @@ -4307,7 +4307,7 @@ void particle_system_update(struct Depsgraph *depsgraph, Scene *scene, Object *o } case PART_FLUID: { - particles_fluid_step(G.main /* Yuck :/ */, &sim, (int)cfra, use_render_params); + particles_fluid_step(&sim, (int)cfra, use_render_params); break; } default: |