From 06ca2c9d0320a4a4beae3c6ca5576ed208331dcb Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Mon, 29 May 2017 16:05:35 +0200 Subject: Fix T51390: Blender 2.78c will freeze or force close when adding particles at random. DM evaluation code was simply never clearing the `deformedOnly` flag when evaluating a generative modifier... Quite astonishing this never got catched before, a lot of particle code relies on valid value of this flag!!! --- source/blender/blenkernel/intern/DerivedMesh.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source/blender/blenkernel') diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index 1f86f616bd3..18e9bdf6cd1 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -2123,6 +2123,8 @@ static void mesh_calc_modifiers( DM_update_weight_mcol(ob, dm, draw_flag, NULL, 0, NULL); append_mask |= CD_MASK_PREVIEW_MLOOPCOL; } + + dm->deformedOnly = false; } isPrevDeform = (mti->type == eModifierTypeType_OnlyDeform); @@ -2463,6 +2465,8 @@ static void editbmesh_calc_modifiers( deformedVerts = NULL; } } + + dm->deformedOnly = false; } /* In case of active preview modifier, make sure preview mask remains for following modifiers. */ -- cgit v1.2.3