Commit: 0b4450124b408124bd615bc9dbce64f9bb8fa683
Author: Antonio Vazquez
Date: Thu May 17 14:13:32 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB0b4450124b408124bd615bc9dbce64f9bb8fa683
Merge branch 'blender2.8' into greasepencil-object
===================================================================
===================================================================
diff --cc source/blender/modifiers/intern/MOD_particleinstance.c
index ce5689cc315,eee7f0c5561..e3be144e70a
--- a/source/blender/modifiers/intern/MOD_particleinstance.c
+++ b/source/blender/modifiers/intern/MOD_particleinstance.c
@@@ -546,13 -547,9 +547,13 @@@ ModifierTypeInfo modifierType_ParticleI
/* deformMatrices */ NULL,
/* deformVertsEM */ NULL,
/* deformMatricesEM */ NULL,
- /* applyModifier */ NULL,
+ /* applyModifier */ applyModifier,
/* applyModifierEM */ NULL,
+ /* gp_deformStroke */ NULL,
+ /* gp_generateStrokes */ NULL,
+ /* gp_bakeModifier */ NULL,
+
/* initData */ initData,
/* requiredDataMask */ requiredDataMask,
/* freeData */ NULL,
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
