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:
authorAntonioya <blendergit@gmail.com>2018-11-04 21:52:42 +0300
committerAntonioya <blendergit@gmail.com>2018-11-04 21:52:42 +0300
commitbbb348afc1fab2c118e2ac68673f1aee6ea578b5 (patch)
tree76dac53fbcda173d1ae5dbd1427e293e7df3630b /source/blender/blenloader
parent665efe401aa91b3b90dc03dac2df187c249f3ae6 (diff)
GP: Move init code to new version section
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r--source/blender/blenloader/intern/versioning_280.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index c470a3a6d96..fc009f6c876 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -2237,17 +2237,12 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
}
- /* TODO: add to next version bump */
- {
+ if (!MAIN_VERSION_ATLEAST(bmain, 280, 30)) {
/* grease pencil main material show switches */
for (Material *mat = bmain->mat.first; mat; mat = mat->id.next) {
if (mat->gp_style) {
- if (((mat->gp_style->flag & GP_STYLE_STROKE_SHOW) == 0) &&
- ((mat->gp_style->flag & GP_STYLE_FILL_SHOW) == 0))
- {
- mat->gp_style->flag |= GP_STYLE_STROKE_SHOW;
- mat->gp_style->flag |= GP_STYLE_FILL_SHOW;
- }
+ mat->gp_style->flag |= GP_STYLE_STROKE_SHOW;
+ mat->gp_style->flag |= GP_STYLE_FILL_SHOW;
}
}
}