[Bf-blender-cvs] [036c95a655e] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object

[Antonio Vazquez]

Commit: 036c95a655ef09ad1a4eb9ea921c2754261f1d58
Author: Antonio Vazquez
Date:   Thu Apr 19 17:13:17 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB036c95a655ef09ad1a4eb9ea921c2754261f1d58

Merge branch 'blender2.8' into greasepencil-object

 Conflicts:
	source/blender/blenloader/intern/versioning_280.c
	source/blender/editors/space_view3d/view3d_header.c

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



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

diff --cc source/blender/blenloader/intern/versioning_280.c
index 9dd7d6d5765,d6cf411c31c..f7a515c589c
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -883,19 -820,8 +875,8 @@@ void blo_do_versions_280(FileData *fd, 
  			printf("You need to combine transparency and emission shaders to the converted Principled shader nodes.\n");
  		}
  
- 		if (!DNA_struct_elem_find(fd->filesdna, "Scene", "ViewRender", "view_render")) {
- 			for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
- 				BLI_strncpy_utf8(scene->view_render.engine_id, scene->r.engine,
- 					sizeof(scene->view_render.engine_id));
- 			}
- 
- 			for (WorkSpace *workspace = main->workspaces.first; workspace; workspace = workspace->id.next) {
- 				BKE_viewrender_init(&workspace->view_render);
- 			}
- 		}
- 
  		if ((DNA_struct_elem_find(fd->filesdna, "ViewLayer", "FreestyleConfig", "freestyle_config") == false) &&
 -		    DNA_struct_elem_find(fd->filesdna, "Scene", "ListBase", "view_layers"))
 +			DNA_struct_elem_find(fd->filesdna, "Scene", "ListBase", "view_layers"))
  		{
  			for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
  				ViewLayer *view_layer;
diff --cc source/blender/modifiers/intern/MOD_particleinstance.c
index 69f6f6d6738,d7cb7fd8d94..71c6a49f54e
--- a/source/blender/modifiers/intern/MOD_particleinstance.c
+++ b/source/blender/modifiers/intern/MOD_particleinstance.c
@@@ -436,11 -539,8 +539,11 @@@ ModifierTypeInfo modifierType_ParticleI
  	/* deformMatricesEM */  NULL,
  	/* applyModifier */     applyModifier,
  	/* applyModifierEM */   NULL,
 +	/* deformStroke */      NULL,
 +	/* generateStrokes */   NULL,
 +	/* bakeModifierGP */    NULL,
  	/* initData */          initData,
- 	/* requiredDataMask */  NULL,
+ 	/* requiredDataMask */  requiredDataMask,
  	/* freeData */          NULL,
  	/* isDisabled */        isDisabled,
  	/* updateDepsgraph */   updateDepsgraph,