griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v2.83-release'

Browse Source
This commit is contained in:
Philipp Oeser
2020-04-20 18:55:08 +02:00
parent 749181ff4d be7c51d076
commit 9618bd9202
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/modifiers/intern/MOD_meshdeform.c
View File

@@ -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])

8
source/blender/modifiers/intern/MOD_solidify_nonmanifold.c
View File

@@ -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;
}