Merge branch 'master' into blender2.8

Conflicts:
	source/blender/editors/space_view3d/drawobject.c

3 files changed, 7 insertions, 7 deletions

diff --git a/source/blender/modifiers/intern/MOD_fluidsim_util.c b/source/blender/modifiers/intern/MOD_fluidsim_util.c
index f4b39f1eab9..4bcc14236a0 100644
--- a/source/blender/modifiers/intern/MOD_fluidsim_util.c
+++ b/source/blender/modifiers/intern/MOD_fluidsim_util.c
@@ -431,7 +431,7 @@ static void fluidsim_read_vel_cache(FluidsimModifierData *fluidmd, DerivedMesh *
 }
 
 static DerivedMesh *fluidsim_read_cache(
-        Main *bmain, Object *ob, DerivedMesh *orgdm,
+        Object *ob, DerivedMesh *orgdm,
         FluidsimModifierData *fluidmd, int framenr, int useRenderParams)
 {
 	int curFrame = framenr /* - 1 */ /*scene->r.sfra*/; /* start with 0 at start frame */ 
@@ -466,7 +466,7 @@ static DerivedMesh *fluidsim_read_cache(
 	/* offset baked frame */
 	curFrame += fss->frameOffset;
 
-	BLI_path_abs(targetFile, modifier_path_relbase(bmain, ob));
+	BLI_path_abs(targetFile, modifier_path_relbase_from_global(ob));
 	BLI_path_frame(targetFile, curFrame, 0); // fixed #frame-no
 
 	/* assign material + flags to new dm
@@ -552,7 +552,7 @@ DerivedMesh *fluidsimModifier_do(
 	
 	/* try to read from cache */
 	/* if the frame is there, fine, otherwise don't do anything */
-	if ((result = fluidsim_read_cache(G.main, ob, dm, fluidmd, framenr, useRenderParams)))
+	if ((result = fluidsim_read_cache(ob, dm, fluidmd, framenr, useRenderParams)))
 		return result;
 	
 	return dm;
diff --git a/source/blender/modifiers/intern/MOD_meshcache.c b/source/blender/modifiers/intern/MOD_meshcache.c
index 5d8ac9e5638..50765079785 100644
--- a/source/blender/modifiers/intern/MOD_meshcache.c
+++ b/source/blender/modifiers/intern/MOD_meshcache.c
@@ -152,7 +152,7 @@ static void meshcache_do(
 
 	/* would be nice if we could avoid doing this _every_ frame */
 	BLI_strncpy(filepath, mcmd->filepath, sizeof(filepath));
-	BLI_path_abs(filepath, ID_BLEND_PATH(G.main, (ID *)ob));
+	BLI_path_abs(filepath, ID_BLEND_PATH_FROM_GLOBAL((ID *)ob));
 
 	switch (mcmd->type) {
 		case MOD_MESHCACHE_TYPE_MDD:
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);
 	}