diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-31 16:37:15 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-31 16:37:15 +0300 |
| commit | b809340960693a3e9808e59de4d1e029226fb492 (patch) | |
| tree | a2f75c291b8ac4d3ffa4abdb3b9fe013f1506dc4 /source/blender/blenkernel/intern/particle_system.c | |
| parent | 3248ac5e83307d623b18ccaed4c0b496121802e5 (diff) | |
| parent | b53d358261a26652d510d62565f1b43035a55e67 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
intern/cycles/blender/blender_curves.cpp
source/blender/blenkernel/BKE_particle.h
source/blender/blenkernel/intern/modifier.c
source/blender/blenkernel/intern/object_update.c
source/blender/blenkernel/intern/particle_system.c
source/blender/editors/object/object_modifier.c
source/blender/editors/physics/physics_fluid.c
source/blender/makesrna/intern/rna_particle.c
source/blender/modifiers/intern/MOD_particlesystem.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, 5 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index 94abfe72b34..88dd3de7fc4 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -74,8 +74,10 @@ #include "BKE_collision.h" #include "BKE_colortools.h" #include "BKE_effect.h" +#include "BKE_global.h" #include "BKE_library.h" #include "BKE_library_query.h" +#include "BKE_main.h" #include "BKE_particle.h" #include "BKE_collection.h" @@ -3805,7 +3807,7 @@ static void cached_step(ParticleSimulationData *sim, float cfra, const bool use_ } } -static void particles_fluid_step(ParticleSimulationData *sim, int UNUSED(cfra), const bool use_render_params) +static void particles_fluid_step(Main *bmain, ParticleSimulationData *sim, int UNUSED(cfra), const bool use_render_params) { ParticleSystem *psys = sim->psys; if (psys->particles) { @@ -3836,7 +3838,7 @@ static void particles_fluid_step(ParticleSimulationData *sim, int UNUSED(cfra), // ok, start loading BLI_join_dirfile(filename, sizeof(filename), fss->surfdataPath, OB_FLUIDSIM_SURF_PARTICLES_FNAME); - BLI_path_abs(filename, modifier_path_relbase(sim->ob)); + BLI_path_abs(filename, modifier_path_relbase(bmain, sim->ob)); BLI_path_frame(filename, curFrame, 0); // fixed #frame-no @@ -4308,7 +4310,7 @@ void particle_system_update(struct Depsgraph *depsgraph, Scene *scene, Object *o } case PART_FLUID: { - particles_fluid_step(&sim, (int)cfra, use_render_params); + particles_fluid_step(G.main /* Yuck :/ */, &sim, (int)cfra, use_render_params); break; } default: |