Merge branch 'master' into blender2.8
[blender.git] / source / blender / modifiers / intern / MOD_meshcache.c
index 5d8ac9e5638f7f58c156053e15d7cf4c9fcac7fc..5076507978572fc47a5addde3596107190f3a365 100644 (file)
@@ -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: