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>2019-11-22 17:30:10 +0300
committerHoward Trickey <howard.trickey@gmail.com>2019-11-22 17:30:10 +0300
commit1304cee920c5f01fd9f0474ea782db61ac031403 (patch)
tree80b4333e88fcf76b35041ea192bf1802d2660fb2 /source/blender
parent27127bf533428c71e81afbad9947aa232523b7a9 (diff)
Fix some of the bevel regression tests.
The code changes for custom bevels did not recalculated profiles in certain non-custom-profile cases after projection plane moves.
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/bmesh/tools/bmesh_bevel.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c
index d1669c87940..268b89e8d90 100644
--- a/source/blender/bmesh/tools/bmesh_bevel.c
+++ b/source/blender/bmesh/tools/bmesh_bevel.c
@@ -5492,7 +5492,11 @@ static void build_vmesh(BevelParams *bp, BMesh *bm, BevVert *bv)
}
else { /* Get the last of the two BoundVerts. */
weld2 = bndv;
- move_weld_profile_planes(bv, weld1, weld2); /* Profile recalculated in next loop. */
+ move_weld_profile_planes(bv, weld1, weld2);
+ if (!bp->use_custom_profile) { /* Else profile recalculated in next loop. */
+ calculate_profile(bp, weld1, !weld1->is_profile_start, false);
+ calculate_profile(bp, weld2, !weld2->is_profile_start, false);
+ }
}
}
} while ((bndv = bndv->next) != vm->boundstart);