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

[Antonioya]

Commit: b4f9b25107fca015f2e14e64ad94d6c0274aaed2
Author: Antonioya
Date:   Thu Aug 23 10:18:19 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBb4f9b25107fca015f2e14e64ad94d6c0274aaed2

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/blenkernel/intern/gpencil_modifier.c
index 57444f90425,3b0c86a1832..752147ae8a9
--- a/source/blender/blenkernel/intern/gpencil_modifier.c
+++ b/source/blender/blenkernel/intern/gpencil_modifier.c
@@@ -409,13 -407,10 +409,12 @@@ 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_Smooth)) {
++							eGpencilModifierType_Offset)) {
 +
  						gps->flag |= GP_STROKE_RECALC_CACHES;
  					}
  				}