diff options
Diffstat (limited to 'source/blender/blenkernel/intern/modifier.c')
| -rw-r--r-- | source/blender/blenkernel/intern/modifier.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c index 86563ab797d..1358951e240 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -61,6 +61,7 @@ #include "BKE_appdir.h" #include "BKE_cdderivedmesh.h" #include "BKE_editmesh.h" +#include "BKE_global.h" #include "BKE_idcode.h" #include "BKE_key.h" #include "BKE_library.h" @@ -71,7 +72,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 */ @@ -797,10 +797,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 |