[Bf-blender-cvs] [5407c3a8b04] greasepencil-object: Merge branch 'master' into greasepencil-object

[Antonioya]

Commit: 5407c3a8b046fef11e469af48abe5903d4cad8b3
Author: Antonioya
Date:   Sat Mar 30 11:37:22 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rB5407c3a8b046fef11e469af48abe5903d4cad8b3

Merge branch 'master' into greasepencil-object

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



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

diff --cc source/blender/blenloader/intern/versioning_280.c
index 95adccf7e85,960fb3b417c..a4fb0469cb0
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -2945,32 -2943,18 +2943,45 @@@ void blo_do_versions_280(FileData *fd, 
  				}
  			}
  		} FOREACH_NODETREE_END;
 +
 +		/* 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;
 +						}
 +					}
 +				}
 +			}
 +		}
  	}
+ 
+ 	if (!MAIN_VERSION_ATLEAST(bmain, 280, 53)) {
+ 		for (Material *mat = bmain->materials.first; mat; mat = mat->id.next) {
+ 			/* Eevee: Keep material appearance consistent with previous behavior. */
+ 			if (!mat->use_nodes || !mat->nodetree || mat->blend_method == MA_BM_SOLID) {
+ 				mat->blend_shadow = MA_BS_SOLID;
+ 			}
+ 		}
+ 	}
+ 
+ 	{
+ 		/* Versioning code until next subversion bump goes here. */
+ 	}
  }