Commit: f415cbec5e5fca58ca7a108d335a9a51a4377bb3
Author: Antonioya
Date: Tue Apr 9 11:38:41 2019 +0200
Branches: greasepencil-object
https://developer.blender.org/rBf415cbec5e5fca58ca7a108d335a9a51a4377bb3
Merge branch 'master' into greasepencil-object
===================================================================
===================================================================
diff --cc source/blender/blenloader/intern/versioning_280.c
index ae525c8339f,a32ff9f5ef0..d6a2cf2765f
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -3022,33 -3030,9 +3031,37 @@@ void blo_do_versions_280(FileData *fd,
}
}
}
+
+ /* init grease pencil brush gradients */
+ if (!DNA_struct_elem_find(fd->filesdna, "BrushGpencilSettings",
"float", "gradient_f")) {
+ for (Brush *brush = bmain->brushes.first; brush; brush
= brush->id.next) {
+ if (brush->gpencil_settings != NULL) {
+ BrushGpencilSettings *gp =
brush->gpencil_settings;
+ gp->gradient_f = 1.0f;
+ gp->gradient_s[0] = 1.0f;
+ gp->gradient_s[1] = 1.0f;
+ }
+ }
+ }
+
+ /* init grease pencil stroke gradients */
+ if (!DNA_struct_elem_find(fd->filesdna, "bGPDstroke", "float",
"gradient_f")) {
+ for (bGPdata *gpd = bmain->gpencils.first; gpd; gpd =
gpd->id.next) {
+ for (bGPDlayer *gpl = gpd->layers.first; gpl;
gpl = gpl->next) {
+ for (bGPDframe *gpf =
gpl->frames.first; gpf; gpf = gpf->next) {
+ for (bGPDstroke *gps =
gpf->strokes.first; gps; gps = gps->next) {
+ gps->gradient_f = 1.0f;
+ gps->gradient_s[0] =
1.0f;
+ gps->gradient_s[1] =
1.0f;
+ }
+ }
+ }
+ }
+ }
+
}
+
+ {
+ /* Versioning code until next subversion bump goes here. */
+ }
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
