diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-09 16:18:21 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-09 16:18:21 +0300 |
commit | 70f8eaf1b769c402ec61d86f25237d6b64186861 (patch) | |
tree | 035d1da0dc7ca1ff1cfefad013181dc0ce3084ed /source/blender/modifiers/intern/MOD_meshcache.c | |
parent | 2ca8230f67db3d6c4693d0a2e0997dfd5de43091 (diff) | |
parent | 638de722775fc43c3543a30aaa888372fe93fe98 (diff) |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/editors/space_view3d/drawobject.c
Diffstat (limited to 'source/blender/modifiers/intern/MOD_meshcache.c')
-rw-r--r-- | source/blender/modifiers/intern/MOD_meshcache.c | 2 |
1 files changed, 1 insertions, 1 deletions
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: |