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:
authorHenrik Dick <weasel>2020-04-15 13:07:04 +0300
committerBastien Montagne <bastien@blender.org>2020-04-15 13:07:58 +0300
commitc1edbe791794e678ab8a986b559b9c117ed7b971 (patch)
tree0ab9335a37d242a66bcb6714826016d173efa5fc /source/blender/modifiers
parentbdf260a1b8f83373695fe8375f4a533e5f018549 (diff)
Fix mistake from last commit to solidify.
While review the behaviour was changed accidentally. Now Solidify just crashes everytime. This is the fix for that. Reviewed By: mont29 Differential Revision: https://developer.blender.org/D7434
Diffstat (limited to 'source/blender/modifiers')
-rw-r--r--source/blender/modifiers/intern/MOD_solidify_extrude.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/modifiers/intern/MOD_solidify_extrude.c b/source/blender/modifiers/intern/MOD_solidify_extrude.c
index 3ba64ce084f..1868bb17851 100644
--- a/source/blender/modifiers/intern/MOD_solidify_extrude.c
+++ b/source/blender/modifiers/intern/MOD_solidify_extrude.c
@@ -236,8 +236,8 @@ Mesh *MOD_solidify_extrude_applyModifier(ModifierData *md,
const bool do_clamp = (smd->offset_clamp != 0.0f);
const bool do_angle_clamp = do_clamp && (smd->flag & MOD_SOLIDIFY_OFFSET_ANGLE_CLAMP) != 0;
const bool do_bevel_convex = bevel_convex != 0.0f;
- const bool do_rim = (smd->flag & MOD_SOLIDIFY_RIM) == 0;
- const bool do_shell = do_rim && (smd->flag & MOD_SOLIDIFY_NOSHELL) == 0;
+ const bool do_rim = (smd->flag & MOD_SOLIDIFY_RIM) != 0;
+ const bool do_shell = !(do_rim && (smd->flag & MOD_SOLIDIFY_NOSHELL) != 0);
/* weights */
MDeformVert *dvert;