diff options
| author | Antonioya <blendergit@gmail.com> | 2019-03-25 19:02:42 +0300 |
|---|---|---|
| committer | Antonioya <blendergit@gmail.com> | 2019-03-25 19:06:07 +0300 |
| commit | 7021bd527380b4d87cf48057f0039509326b03dd (patch) | |
| tree | 55126437da17d736a789d236c8a98d199a1e6260 /source/blender/blenloader/intern | |
| parent | 84240ebb3ebde58f6bfba256e49d37697fb6bc9f (diff) | |
GPencil: Only brushes with pinned materials have materials
Using GP_BRUSH_MATERIAL_PINNED to switch between active material and brush material, instead of updating all brushes on active material changes. This will allow brushes to have no material and therefore to not inflate the user count.
This fix T62465.
Patch contributed by @matc
Reviewers: @brecht @antoniov @billreynish @mendio
Diffstat (limited to 'source/blender/blenloader/intern')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 3c5a0f136ba..190b07991e5 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -2617,8 +2617,19 @@ static void lib_link_brush(FileData *fd, Main *main) brush->paint_curve = newlibadr_us(fd, brush->id.lib, brush->paint_curve); /* link default grease pencil palette */ - if (brush->gpencil_settings != NULL) { - brush->gpencil_settings->material = newlibadr_us(fd, brush->id.lib, brush->gpencil_settings->material); + if (brush->gpencil_settings != NULL) + { + if (brush->gpencil_settings->flag & GP_BRUSH_MATERIAL_PINNED) + { + brush->gpencil_settings->material = newlibadr_us(fd, brush->id.lib, brush->gpencil_settings->material); + + if (!brush->gpencil_settings->material) { + brush->gpencil_settings->flag &= ~GP_BRUSH_MATERIAL_PINNED; + } + } + else { + brush->gpencil_settings->material = NULL; + } } brush->id.tag &= ~LIB_TAG_NEED_LINK; |