[Bf-blender-cvs] [bbb348afc1f] blender2.8: GP: Move init code to new version section

[Antonioya]

Commit: bbb348afc1fab2c118e2ac68673f1aee6ea578b5
Author: Antonioya
Date:   Sun Nov 4 19:52:42 2018 +0100
Branches: blender2.8
https://developer.blender.org/rBbbb348afc1fab2c118e2ac68673f1aee6ea578b5

GP: Move init code to new version section

===================================================================

M	source/blender/blenloader/intern/versioning_280.c

===================================================================

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;
 			}
 		}
 	}