[Bf-blender-cvs] [1dbece8080f] greasepencil-object: Merge branch 'master' into greasepencil-object

[Antonioya]

Commit: 1dbece8080f43909fa5b687995fa4ac900f6a1c5
Author: Antonioya
Date:   Sun Mar 24 12:12:26 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rB1dbece8080f43909fa5b687995fa4ac900f6a1c5

Merge branch 'master' into greasepencil-object

 Conflicts:
	source/blender/blenloader/intern/versioning_280.c

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



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

diff --cc source/blender/blenloader/intern/versioning_280.c
index be1bfea540c,6c5eb269c5c..44e262ad6be
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -2920,31 -2920,16 +2920,42 @@@ void blo_do_versions_280(FileData *fd, 
  				part->draw_as = PART_DRAW_NOT;
  			}
  		}
+ 
+ 		if (!DNA_struct_elem_find(fd->filesdna, "TriangulateModifierData", "int", "min_vertices")) {
+ 			for (Object *ob = bmain->objects.first; ob; ob = ob->id.next) {
+ 				for (ModifierData *md = ob->modifiers.first; md; md = md->next) {
+ 					if (md->type == eModifierType_Triangulate) {
+ 						TriangulateModifierData *smd = (TriangulateModifierData *)md;
+ 						smd->min_vertices = 4;
+ 					}
+ 				}
+ 			}
+ 		}
 +		/* 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;
 +						}
 +					}
 +				}
 +			}
 +		}
  	}
  }