hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[#1761] Correctly fix #1375 this time...

Browse Source
This commit is contained in:
SiboVG 2022-10-21 14:23:01 +02:00
parent 281169627e
commit 164513fd6d
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/net/sf/openrocket/rocketcomponent/Transition.java
View File

@ -257,7 +257,8 @@ public class Transition extends SymmetricComponent implements InsideColorCompone
if (type == null) { if (type == null) {
throw new IllegalArgumentException("setType called with null argument"); throw new IllegalArgumentException("setType called with null argument");
} }
if ((this.type == type) && (this.clipped == type.isClippable()) && (this.shapeParameter == type.defaultParameter()))
if (this.type == type)
return; return;
this.type = type; this.type = type;
this.clipped = type.isClippable(); this.clipped = type.isClippable();
@ -687,6 +688,8 @@ public class Transition extends SymmetricComponent implements InsideColorCompone
if ( preset.has(ComponentPreset.SHAPE) ) { if ( preset.has(ComponentPreset.SHAPE) ) {
Shape s = preset.get(ComponentPreset.SHAPE); Shape s = preset.get(ComponentPreset.SHAPE);
this.setType(s); this.setType(s);
this.setClipped(s.canClip);
this.setShapeParameter(s.defaultParameter());
} }
if ( preset.has(ComponentPreset.AFT_OUTER_DIAMETER) ) { if ( preset.has(ComponentPreset.AFT_OUTER_DIAMETER) ) {
double outerDiameter = preset.get(ComponentPreset.AFT_OUTER_DIAMETER); double outerDiameter = preset.get(ComponentPreset.AFT_OUTER_DIAMETER);