Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHoward Trickey <howard.trickey@gmail.com>2018-08-22 14:08:42 +0300
committerHoward Trickey <howard.trickey@gmail.com>2018-08-22 14:08:42 +0300
commit9f6cde53cf61762abe917420ab1727e9b19a01ee (patch)
treefa8f3cb582a619ff9c6056a648d4803551911894
parent9e11b8e24939fbc73930bc05ddea1f79bb00783f (diff)
Fix bevel crash T56287, when face strength goes to 1.
m---------release/scripts/addons0
m---------release/scripts/addons_contrib0
-rw-r--r--source/blender/modifiers/intern/MOD_bevel.c2
m---------source/tools0
4 files changed, 1 insertions, 1 deletions
diff --git a/release/scripts/addons b/release/scripts/addons
-Subproject 371960484a38fc64e0a2635170a41a0d8ab2f6b
+Subproject 9ae033c49c1b16718eac6306bdc271a5e6e6bf3
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
-Subproject 15b25a42783d1e516b5298d70b582fae2559ae1
+Subproject f178e6c933a25c621a5cc7d92935b66cd2ec2f5
diff --git a/source/blender/modifiers/intern/MOD_bevel.c b/source/blender/modifiers/intern/MOD_bevel.c
index 5b3f8d5313a..ef447ff30ec 100644
--- a/source/blender/modifiers/intern/MOD_bevel.c
+++ b/source/blender/modifiers/intern/MOD_bevel.c
@@ -232,7 +232,7 @@ static void bevel_mod_harden_normals(
short *clnors = BM_ELEM_CD_GET_VOID_P(l, cd_clnors_offset);
/* If vertex is edge vert with 1 reconnected face */
- if (recon_face_count == 1 || do_normal_to_recon) {
+ if (recon_face_count == 1 || (recon_face != NULL && do_normal_to_recon)) {
BKE_lnor_space_custom_normal_to_data(
bm->lnor_spacearr->lspacearr[l_index], recon_face->no, clnors);
}
diff --git a/source/tools b/source/tools
-Subproject 11656ebaf7f912cdb1b5eb39c5d0a3b5d492c1a
+Subproject ca3e38d89666c422d6681bb06967a59ef1a4a7d