From 7865185d986558b5fd40e669c91f86f1967f0304 Mon Sep 17 00:00:00 2001 From: Henrik Dick Date: Mon, 20 Apr 2020 16:15:53 +0200 Subject: Fix T75840: Add check for not generated edges The value of `new_edge` is `SOLIDIFY_EMPTY_TAG=2^32-1` if the edge is not generated. The code from D7334 was missing this check. Reviewed By: mont29 Maniphest Tasks: T75840 Differential Revision: https://developer.blender.org/D7463 --- source/blender/modifiers/intern/MOD_solidify_nonmanifold.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'source/blender/modifiers') diff --git a/source/blender/modifiers/intern/MOD_solidify_nonmanifold.c b/source/blender/modifiers/intern/MOD_solidify_nonmanifold.c index e56ae82379e..3188bb59ae4 100644 --- a/source/blender/modifiers/intern/MOD_solidify_nonmanifold.c +++ b/source/blender/modifiers/intern/MOD_solidify_nonmanifold.c @@ -2012,9 +2012,11 @@ Mesh *MOD_solidify_nonmanifold_applyModifier(ModifierData *md, if (ed->crease > max_crease) { max_crease = ed->crease; } - char bweight = medge[g->edges[k]->new_edge].bweight; - if (bweight > max_bweight) { - max_bweight = bweight; + if (g->edges[k]->new_edge != MOD_SOLIDIFY_EMPTY_TAG) { + char bweight = medge[g->edges[k]->new_edge].bweight; + if (bweight > max_bweight) { + max_bweight = bweight; + } } flag |= ed->flag; } -- cgit v1.2.3 From be7c51d076be4c826e0b7c1afec59b86b4edc33b Mon Sep 17 00:00:00 2001 From: Philipp Oeser Date: Mon, 20 Apr 2020 11:08:49 +0200 Subject: Fix T75885: Mesh deform modifier not updating on own transforms Added the missing relation. Maniphest Tasks: T75885 Differential Revision: https://developer.blender.org/D7473 --- source/blender/modifiers/intern/MOD_meshdeform.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source/blender/modifiers') diff --git a/source/blender/modifiers/intern/MOD_meshdeform.c b/source/blender/modifiers/intern/MOD_meshdeform.c index 7125d0df3a1..d1fa496c3e5 100644 --- a/source/blender/modifiers/intern/MOD_meshdeform.c +++ b/source/blender/modifiers/intern/MOD_meshdeform.c @@ -161,6 +161,8 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte DEG_add_object_relation(ctx->node, mmd->object, DEG_OB_COMP_TRANSFORM, "Mesh Deform Modifier"); DEG_add_object_relation(ctx->node, mmd->object, DEG_OB_COMP_GEOMETRY, "Mesh Deform Modifier"); } + /* We need own transformation as well. */ + DEG_add_modifier_to_transform_relation(ctx->node, "Mesh Deform Modifier"); } static float meshdeform_dynamic_bind(MeshDeformModifierData *mmd, float (*dco)[3], float vec[3]) -- cgit v1.2.3