Merge branch 'blender-v2.83-release'

2 files changed, 7 insertions, 3 deletions

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])
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;
               }