Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions characters/chicken.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"bodyCharacteristic": "Default.04",
"ears": "Default",
"eyebrows": "Thin.BrownDark",
"eyes": "Large_Eyes.BrownLight",
"face": "Face_MakeUp_HeavyEyeliner",
"gloves": "Straps_Leather.BrownDark",
"haircut": "PonytailBraidedLong.BlondSand",
"headAccessory": "Hairband.Brown",
"mouth": "Mouth_Makeup",
"overtop": "Shark_Tooth_Necklace.White",
"pants": "HighSkirt_Punk.Brown.HiddenBelt",
"shoes": "ThickSandals.Brown",
"undertop": "Top_Wasteland_Marauder.Black",
"underwear": "Boxer.Black"
}
8 changes: 6 additions & 2 deletions pkg/merger/merger.go
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,14 @@ func (m *Merger) isAttachmentPoint(node *blockymodel.Node) bool {
if node.IsSkeletonReference() {
return true
}
// Also check if it matches a bone name and has no geometry
// Also check if it matches a bone name and has no geometry.
// The matching base node must also be a non-geometry node (type "none") to avoid
// false matches against geometry nodes that happen to share the same name.
if node.Shape != nil && node.Shape.Type == "none" {
baseNode := findNodeByName(m.base.Nodes, node.Name)
return baseNode != nil
if baseNode != nil && baseNode.Shape != nil && baseNode.Shape.Type == "none" {
return true
}
}
return false
}
Expand Down
Loading