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/blenkernel/intern/modifier.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source/blender/blenkernel/intern/modifier.c') diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c index 19c0a083703..50923901a36 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -58,6 +58,7 @@ #include "BLT_translation.h" #include "BKE_appdir.h" +#include "BKE_global.h" #include "BKE_key.h" #include "BKE_library.h" #include "BKE_library_query.h" @@ -65,7 +66,6 @@ #include "BKE_DerivedMesh.h" /* may move these, only for modifier_path_relbase */ -#include "BKE_global.h" /* ugh, G.main->name only */ #include "BKE_main.h" /* end */ @@ -765,10 +765,10 @@ void test_object_modifiers(Object *ob) * - else if the file has been saved return the blend file path. * - else if the file isn't saved and the ID isn't from a library, return the temp dir. */ -const char *modifier_path_relbase(Object *ob) +const char *modifier_path_relbase(Main *bmain, Object *ob) { if (G.relbase_valid || ID_IS_LINKED(ob)) { - return ID_BLEND_PATH(G.main, &ob->id); + return ID_BLEND_PATH(bmain, &ob->id); } else { /* last resort, better then using "" which resolves to the current -- cgit v1.2.3