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

[Antonioya]

Commit: ed47fc02e151d636bee633b3d060238fbb4381c2
Author: Antonioya
Date:   Thu Aug 30 11:22:23 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBed47fc02e151d636bee633b3d060238fbb4381c2

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/blenkernel/intern/gpencil_modifier.c
index 458cc548263,1cfbaed37fe..af82d8fa200
--- a/source/blender/blenkernel/intern/gpencil_modifier.c
+++ b/source/blender/blenkernel/intern/gpencil_modifier.c
@@@ -423,11 -423,10 +423,11 @@@ void BKE_gpencil_stroke_modifiers(Depsg
  				/* some modifiers could require a recalc of fill triangulation data */
  				if (gpd->flag & GP_DATA_STROKE_FORCE_RECALC) {
  					if (ELEM(md->type,
 -						eGpencilModifierType_Hook,
 -						eGpencilModifierType_Lattice,
 -						eGpencilModifierType_Offset))
 +							eGpencilModifierType_Armature,
 +							eGpencilModifierType_Hook,
 +							eGpencilModifierType_Lattice,
- 							eGpencilModifierType_Noise,
- 							eGpencilModifierType_Offset)) {
++							eGpencilModifierType_Offset))
+ 					{
  
  						gps->flag |= GP_STROKE_RECALC_CACHES;
  					}