diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-09 16:16:44 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-09 16:17:04 +0300 |
| commit | 638de722775fc43c3543a30aaa888372fe93fe98 (patch) | |
| tree | 08991e0d3279693dfa8e4fcfec696bfa9f1b2499 /source/blender/modifiers/intern/MOD_ocean.c | |
| parent | fb565ddb681f39cbe47e91d11e5b728bb4314a7b (diff) | |
Cleanup: remove some G.main usages.
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 9a60e8e1fbd..c29e835797b 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, @@ -449,7 +449,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); } |