[Bf-blender-cvs] [1304cee920c] master: Fix some of the bevel regression tests.
Howard Trickey
noreply at git.blender.org
Fri Nov 22 15:31:53 CET 2019
Commit: 1304cee920c5f01fd9f0474ea782db61ac031403
Author: Howard Trickey
Date: Fri Nov 22 09:30:10 2019 -0500
Branches: master
https://developer.blender.org/rB1304cee920c5f01fd9f0474ea782db61ac031403
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.
===================================================================
M source/blender/bmesh/tools/bmesh_bevel.c
===================================================================
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);
More information about the Bf-blender-cvs
mailing list