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

[Antonio Vazquez]

Commit: de00a05ade9e78b3dae2efd4980d5fcd09edb101
Author: Antonio Vazquez
Date:   Tue May 8 10:49:37 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBde00a05ade9e78b3dae2efd4980d5fcd09edb101

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/modifiers/intern/MOD_weightvgedit.c
index 0afa0931dff,cc000cbee09..5c82a78acfa
--- a/source/blender/modifiers/intern/MOD_weightvgedit.c
+++ b/source/blender/modifiers/intern/MOD_weightvgedit.c
@@@ -278,13 -299,9 +299,13 @@@ ModifierTypeInfo modifierType_WeightVGE
  	/* deformMatrices */    NULL,
  	/* deformVertsEM */     NULL,
  	/* deformMatricesEM */  NULL,
- 	/* applyModifier */     NULL,
+ 	/* applyModifier */     applyModifier,
  	/* applyModifierEM */   NULL,
  
 +	/* deformStroke */      NULL,
 +	/* generateStrokes */   NULL,
 +	/* bakeModifierGP */    NULL,
 +
  	/* initData */          initData,
  	/* requiredDataMask */  requiredDataMask,
  	/* freeData */          freeData,
diff --cc source/blender/modifiers/intern/MOD_weightvgmix.c
index e15b02d9144,2ea721c1982..016faf13bc0
--- a/source/blender/modifiers/intern/MOD_weightvgmix.c
+++ b/source/blender/modifiers/intern/MOD_weightvgmix.c
@@@ -405,13 -425,9 +425,13 @@@ ModifierTypeInfo modifierType_WeightVGM
  	/* 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_weightvgproximity.c
index a1f1af48882,85d647c3f41..cd3197a5b8e
--- a/source/blender/modifiers/intern/MOD_weightvgproximity.c
+++ b/source/blender/modifiers/intern/MOD_weightvgproximity.c
@@@ -589,13 -607,9 +607,13 @@@ ModifierTypeInfo modifierType_WeightVGP
  	/* deformMatrices */    NULL,
  	/* deformVertsEM */     NULL,
  	/* deformMatricesEM */  NULL,
- 	/* applyModifier */     NULL,
+ 	/* applyModifier */     applyModifier,
  	/* applyModifierEM */   NULL,
  
 +	/* deformStroke */      NULL,
 +	/* generateStrokes */   NULL,
 +	/* bakeModifierGP */    NULL,
 +
  	/* initData */          initData,
  	/* requiredDataMask */  requiredDataMask,
  	/* freeData */          NULL,