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

[Antonio Vazquez]

Commit: b1accfaa1957a3c966d6401ae3dd4ed30ea1907d
Author: Antonio Vazquez
Date:   Mon May 7 15:42:04 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBb1accfaa1957a3c966d6401ae3dd4ed30ea1907d

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/modifiers/intern/MOD_edgesplit.c
index 3c76be279d5,10e26a918be..f8f6cf11e95
--- a/source/blender/modifiers/intern/MOD_edgesplit.c
+++ b/source/blender/modifiers/intern/MOD_edgesplit.c
@@@ -160,13 -173,9 +173,13 @@@ ModifierTypeInfo modifierType_EdgeSpli
  	/* deformMatrices */    NULL,
  	/* deformVertsEM */     NULL,
  	/* deformMatricesEM */  NULL,
- 	/* applyModifier */     NULL,
+ 	/* applyModifier */     applyModifier,
  	/* applyModifierEM */   NULL,
  
 +	/* deformStroke */      NULL,
 +	/* generateStrokes */   NULL,
 +	/* bakeModifierGP */    NULL,
 +
  	/* initData */          initData,
  	/* requiredDataMask */  NULL,
  	/* freeData */          NULL,
diff --cc source/blender/modifiers/intern/MOD_normal_edit.c
index d30896a5545,7f080a0bd20..81f5ab26129
--- a/source/blender/modifiers/intern/MOD_normal_edit.c
+++ b/source/blender/modifiers/intern/MOD_normal_edit.c
@@@ -545,13 -563,9 +563,13 @@@ ModifierTypeInfo modifierType_NormalEdi
  	/* deformMatrices */    NULL,
  	/* deformVertsEM */     NULL,
  	/* deformMatricesEM */  NULL,
- 	/* applyModifier */     NULL,
+ 	/* applyModifier */     applyModifier,
  	/* applyModifierEM */   NULL,
  
 +	/* deformStroke */      NULL,
 +	/* generateStrokes */   NULL,
 +	/* bakeModifierGP */    NULL,
 +
  	/* initData */          initData,
  	/* requiredDataMask */  requiredDataMask,
  	/* freeData */          NULL,