Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonio Vazquez <blendergit@gmail.com>2020-02-06 13:31:33 +0300
committerAntonio Vazquez <blendergit@gmail.com>2020-02-06 13:31:33 +0300
commit617f6bc32024c1f1029d6f3db4db6cec48797cd5 (patch)
treef7187a2bc633d04a8d67448c917d75e95c41f98d /source/blender/blenloader
parentefa2ffaa2d2763391bf3a67fd6fc99bd1bfd2bc4 (diff)
parent342ceba5bf6e48ed0200bf13c3c65a5be6c6e1eb (diff)
Merge branch 'blender-v2.82-release'
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r--source/blender/blenloader/intern/readfile.c8
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;