From b53d358261a26652d510d62565f1b43035a55e67 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Thu, 31 May 2018 15:24:30 +0200 Subject: Cleanup: remove G.main from BKE modifier. --- source/blender/modifiers/intern/MOD_ocean.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'source/blender/modifiers/intern/MOD_ocean.c') diff --git a/source/blender/modifiers/intern/MOD_ocean.c b/source/blender/modifiers/intern/MOD_ocean.c index d001917fce8..9a60e8e1fbd 100644 --- a/source/blender/modifiers/intern/MOD_ocean.c +++ b/source/blender/modifiers/intern/MOD_ocean.c @@ -41,15 +41,17 @@ #include "BLI_utildefines.h" #include "BKE_cdderivedmesh.h" +#include "BKE_global.h" +#include "BKE_main.h" #include "BKE_modifier.h" #include "BKE_ocean.h" #include "MOD_modifiertypes.h" #ifdef WITH_OCEANSIM -static void init_cache_data(Object *ob, struct OceanModifierData *omd) +static void init_cache_data(Main *bmain, Object *ob, struct OceanModifierData *omd) { - const char *relbase = modifier_path_relbase(ob); + const char *relbase = modifier_path_relbase(bmain, ob); omd->oceancache = BKE_ocean_init_cache(omd->cachepath, relbase, omd->bakestart, omd->bakeend, omd->wave_scale, @@ -447,7 +449,7 @@ static DerivedMesh *doOcean( /* do ocean simulation */ if (omd->cached == true) { if (!omd->oceancache) { - init_cache_data(ob, omd); + init_cache_data(G.main, ob, omd); } BKE_ocean_simulate_cache(omd->oceancache, md->scene->r.cfra); } -- cgit v1.2.3