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

[Antonio Vazquez]

Commit: 77b58ec582ec1faa9dc4d2a95597b7e4795d5bbb
Author: Antonio Vazquez
Date:   Wed May 9 19:00:24 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB77b58ec582ec1faa9dc4d2a95597b7e4795d5bbb

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/modifiers/intern/MOD_boolean.c
index f65e790acdb,7694265a172..ffd8368460c
--- a/source/blender/modifiers/intern/MOD_boolean.c
+++ b/source/blender/modifiers/intern/MOD_boolean.c
@@@ -355,13 -357,9 +357,13 @@@ ModifierTypeInfo modifierType_Boolean 
  	/* deformMatrices */    NULL,
  	/* deformVertsEM */     NULL,
  	/* deformMatricesEM */  NULL,
- 	/* applyModifier */     NULL,
+ 	/* applyModifier */     applyModifier,
  	/* applyModifierEM */   NULL,
  
 +	/* deformStroke */      NULL,
 +	/* generateStrokes */   NULL,
 +	/* bakeModifierGP */    NULL,
 +
  	/* initData */          initData,
  	/* requiredDataMask */  requiredDataMask,
  	/* freeData */          NULL,
diff --cc source/blender/modifiers/intern/MOD_triangulate.c
index f7f6e589523,4d71b59bf31..25054398294
--- a/source/blender/modifiers/intern/MOD_triangulate.c
+++ b/source/blender/modifiers/intern/MOD_triangulate.c
@@@ -111,13 -116,9 +116,13 @@@ ModifierTypeInfo modifierType_Triangula
  	/* deformMatrices */    NULL,
  	/* deformVertsEM */     NULL,
  	/* deformMatricesEM */  NULL,
- 	/* applyModifier */     NULL,
+ 	/* applyModifier */     applyModifier,
  	/* applyModifierEM */   NULL,
  
 +	/* deformStroke */      NULL,
 +	/* generateStrokes */   NULL,
 +	/* bakeModifierGP */    NULL,
 +
  	/* initData */          initData,
  	/* requiredDataMask */  NULL, //requiredDataMask,
  	/* freeData */          NULL,