Merge branch 'master' into blender2.8

2017-05-31 15:51:17 +02:00
parent 82276d6cf7 a481908232
commit f32a18994a
62 changed files with 820 additions and 545 deletions
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -2125,6 +2125,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);
@@ -2465,6 +2467,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. */