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

[Campbell Barton]

Commit: 6cb893f932e380f331e9e00053ecdcd2ff4074fb
Author: Campbell Barton
Date:   Fri May 11 13:53:34 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB6cb893f932e380f331e9e00053ecdcd2ff4074fb

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/modifiers/intern/MOD_decimate.c
index 591fed76f37,b004da7df6a..87d0a3cfe98
--- a/source/blender/modifiers/intern/MOD_decimate.c
+++ b/source/blender/modifiers/intern/MOD_decimate.c
@@@ -220,13 -225,9 +225,13 @@@ ModifierTypeInfo modifierType_Decimate 
  	/* deformMatrices */    NULL,
  	/* deformVertsEM */     NULL,
  	/* deformMatricesEM */  NULL,
- 	/* applyModifier */     NULL,
+ 	/* applyModifier */     applyModifier,
  	/* applyModifierEM */   NULL,
  
 +	/* deformStroke */      NULL,
 +	/* generateStrokes */   NULL,
 +	/* bakeModifierGP */    NULL,
 +
  	/* initData */          initData,
  	/* requiredDataMask */  requiredDataMask,
  	/* freeData */          NULL,