diff options
author | Antonio Vazquez <blendergit@gmail.com> | 2020-02-06 13:31:33 +0300 |
---|---|---|
committer | Antonio Vazquez <blendergit@gmail.com> | 2020-02-06 13:31:33 +0300 |
commit | 617f6bc32024c1f1029d6f3db4db6cec48797cd5 (patch) | |
tree | f7187a2bc633d04a8d67448c917d75e95c41f98d /source/blender | |
parent | efa2ffaa2d2763391bf3a67fd6fc99bd1bfd2bc4 (diff) | |
parent | 342ceba5bf6e48ed0200bf13c3c65a5be6c6e1eb (diff) |
Merge branch 'blender-v2.82-release'
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 30becd855ae..2cc2f6df18b 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -6953,6 +6953,14 @@ static void direct_link_gpencil(FileData *fd, bGPdata *gpd) gpd->adt = newdataadr(fd, gpd->adt); direct_link_animdata(fd, gpd->adt); + /* If linking from a library ensure full objectmode. */ + if (gpd->id.lib != NULL) { + gpd->flag &= ~GP_DATA_STROKE_PAINTMODE; + gpd->flag &= ~GP_DATA_STROKE_EDITMODE; + gpd->flag &= ~GP_DATA_STROKE_SCULPTMODE; + gpd->flag &= ~GP_DATA_STROKE_WEIGHTMODE; + } + /* init stroke buffer */ gpd->runtime.sbuffer = NULL; gpd->runtime.sbuffer_used = 0; |