From 10c4d3da827a5fa1d0854f2fff655fcda96cf2c1 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Sat, 21 Oct 2023 01:42:16 +0200 Subject: [PATCH] Include radius clamping in clamping exclude --- .../net/sf/openrocket/rocketcomponent/Transition.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/core/src/net/sf/openrocket/rocketcomponent/Transition.java b/core/src/net/sf/openrocket/rocketcomponent/Transition.java index bc1679f09..7f00daf32 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/Transition.java +++ b/core/src/net/sf/openrocket/rocketcomponent/Transition.java @@ -402,7 +402,10 @@ public class Transition extends SymmetricComponent implements InsideColorCompone ((Transition) listener).setForeShoulderRadius(foreShoulderRadius, doClamping); } } - foreShoulderRadius = Math.min(foreShoulderRadius, getForeRadius()); + + if (doClamping) { + foreShoulderRadius = Math.min(foreShoulderRadius, getForeRadius()); + } if (MathUtil.equals(this.foreShoulderRadius, foreShoulderRadius)) return; @@ -486,7 +489,9 @@ public class Transition extends SymmetricComponent implements InsideColorCompone } } - aftShoulderRadius = Math.min(aftShoulderRadius, getAftRadius()); + if (doClamping) { + aftShoulderRadius = Math.min(aftShoulderRadius, getAftRadius()); + } if (MathUtil.equals(this.aftShoulderRadius, aftShoulderRadius)) return;