archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: remove some G.main usages.

Browse Source
This commit is contained in:
Bastien Montagne
2018-06-09 15:16:44 +02:00
parent fb565ddb68
commit 638de72277
15 changed files with 74 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/modifiers/intern/MOD_ocean.c
View File

@@ -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);
}