diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-31 16:24:30 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-31 16:24:30 +0300 |
| commit | b53d358261a26652d510d62565f1b43035a55e67 (patch) | |
| tree | b952fa8fa04aee19d7ae6ebd6555e2220d2dbe31 /source/blender/makesrna/intern/rna_fluidsim.c | |
| parent | 28369f725c10f167e504f0acd695a0f9d3c2a709 (diff) | |
Cleanup: remove G.main from BKE modifier.
Diffstat (limited to 'source/blender/makesrna/intern/rna_fluidsim.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_fluidsim.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/makesrna/intern/rna_fluidsim.c b/source/blender/makesrna/intern/rna_fluidsim.c index c7cfde18723..d1ba034d91a 100644 --- a/source/blender/makesrna/intern/rna_fluidsim.c +++ b/source/blender/makesrna/intern/rna_fluidsim.c @@ -86,14 +86,14 @@ static void rna_fluid_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerR WM_main_add_notifier(NC_OBJECT | ND_MODIFIER, ob); } -static int fluidsim_find_lastframe(Object *ob, FluidsimSettings *fss) +static int fluidsim_find_lastframe(Main *bmain, Object *ob, FluidsimSettings *fss) { char targetFileTest[FILE_MAX]; char targetFile[FILE_MAX]; int curFrame = 1; BLI_join_dirfile(targetFile, sizeof(targetFile), fss->surfdataPath, OB_FLUIDSIM_SURF_FINAL_OBJ_FNAME); - BLI_path_abs(targetFile, modifier_path_relbase(ob)); + BLI_path_abs(targetFile, modifier_path_relbase(bmain, ob)); do { BLI_strncpy(targetFileTest, targetFile, sizeof(targetFileTest)); @@ -109,7 +109,7 @@ static void rna_fluid_find_enframe(Main *bmain, Scene *scene, PointerRNA *ptr) FluidsimModifierData *fluidmd = (FluidsimModifierData *)modifiers_findByType(ob, eModifierType_Fluidsim); if (fluidmd->fss->flag & OB_FLUIDSIM_REVERSE) { - fluidmd->fss->lastgoodframe = fluidsim_find_lastframe(ob, fluidmd->fss); + fluidmd->fss->lastgoodframe = fluidsim_find_lastframe(bmain, ob, fluidmd->fss); } else { fluidmd->fss->lastgoodframe = -1; |