diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-12 10:15:49 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-12 10:15:49 +0300 |
| commit | 99bb1accbbb8e1ba38f30b073b22deb107bf3220 (patch) | |
| tree | 7852ec686524e785486c452ec959713abbbef666 /source/blender/blenkernel/intern/modifier.c | |
| parent | 732cd96737007b1411a161369f842209a4c26419 (diff) | |
| parent | b8f217ef213f908a6b5407f162a8f980091e838d (diff) | |
Merge branch 'master' into asset-experiments
Conflicts:
source/blender/blenloader/intern/readfile.c
source/blender/windowmanager/intern/wm_init_exit.c
Diffstat (limited to 'source/blender/blenkernel/intern/modifier.c')
| -rw-r--r-- | source/blender/blenkernel/intern/modifier.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c index 716da14cae6..41e4c21d814 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -707,7 +707,7 @@ void test_object_modifiers(Object *ob) */ const char *modifier_path_relbase(Object *ob) { - if (G.relbase_valid || ob->id.lib) { + if (G.relbase_valid || ID_IS_LINKED_DATABLOCK(ob)) { return ID_BLEND_PATH(G.main, &ob->id); } else { |