Skip to content

Commit

Permalink
Merge branch 'dev' into jonathon/cnx-1329-allow-for-nested-saved-sets
Browse files Browse the repository at this point in the history
  • Loading branch information
jsdbroughton authored Feb 27, 2025
2 parents 2029a41 + 3ff4075 commit 95432f6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Build/Consts.cs
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public static class Consts
]
),
new(
"tekla-structures",
"teklastructures",
[
new("Connectors/Tekla/Speckle.Connector.Tekla2023", "net48"),
new("Connectors/Tekla/Speckle.Connector.Tekla2024", "net48")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ CDB.FeatureLineCollection mainFeaturelineCollection in baseline
}
if (mainFeatureLines.Count > 0)
{
convertedBaseline["mainBaselineFeatureLines"] = mainFeatureLines;
convertedBaseline["@mainBaselineFeatureLines"] = mainFeatureLines;
}

List<Base> offsetFeatureLines = new();
Expand All @@ -109,7 +109,7 @@ CDB.FeatureLineCollection featurelineCollection in offsetFeaturelineCollection.F
}
if (offsetFeatureLines.Count > 0)
{
convertedBaseline["offsetBaselineFeatureLines"] = mainFeatureLines;
convertedBaseline["@offsetBaselineFeatureLines"] = mainFeatureLines;
}

// get the baseline regions
Expand Down Expand Up @@ -220,7 +220,7 @@ out List<SOG.Mesh>? display
{
string subassemblyId = appliedSubassembly.SubassemblyId.GetSpeckleApplicationId();
string name = subassemblyNameCache.TryGetValue(appliedSubassembly.SubassemblyId, out string? cachedName)
? cachedName
? cachedName!
: subassemblyId;

Dictionary<string, object?> appliedSubassemblyDict =
Expand Down

0 comments on commit 95432f6

Please sign in to comment.