diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-09 16:18:21 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-09 16:18:21 +0300 |
| commit | 70f8eaf1b769c402ec61d86f25237d6b64186861 (patch) | |
| tree | 035d1da0dc7ca1ff1cfefad013181dc0ce3084ed /source/blender/modifiers/intern/MOD_ocean.c | |
| parent | 2ca8230f67db3d6c4693d0a2e0997dfd5de43091 (diff) | |
| parent | 638de722775fc43c3543a30aaa888372fe93fe98 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/editors/space_view3d/drawobject.c
Diffstat (limited to 'source/blender/modifiers/intern/MOD_ocean.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_ocean.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/modifiers/intern/MOD_ocean.c b/source/blender/modifiers/intern/MOD_ocean.c index 921677ce1b1..af5b537ca52 100644 --- a/source/blender/modifiers/intern/MOD_ocean.c +++ b/source/blender/modifiers/intern/MOD_ocean.c @@ -49,9 +49,9 @@ #include "MOD_modifiertypes.h" #ifdef WITH_OCEANSIM -static void init_cache_data(Main *bmain, Object *ob, struct OceanModifierData *omd) +static void init_cache_data(Object *ob, struct OceanModifierData *omd) { - const char *relbase = modifier_path_relbase(bmain, ob); + const char *relbase = modifier_path_relbase_from_global(ob); omd->oceancache = BKE_ocean_init_cache(omd->cachepath, relbase, omd->bakestart, omd->bakeend, omd->wave_scale, @@ -448,7 +448,7 @@ static DerivedMesh *doOcean( /* do ocean simulation */ if (omd->cached == true) { if (!omd->oceancache) { - init_cache_data(G.main, ob, omd); + init_cache_data(ob, omd); } BKE_ocean_simulate_cache(omd->oceancache, md->scene->r.cfra); } |