Skip to content

Commit

Permalink
bug: Resolve merge conflict (#96)
Browse files Browse the repository at this point in the history
  • Loading branch information
scottanderson authored Mar 14, 2024
1 parent 0f365ce commit 5d6cf9f
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/properties/struct_property.rs
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,7 @@ impl PropertyTrait for StructProperty {
);
cursor.write_f32::<LittleEndian>(vector.x.0)?;
cursor.write_f32::<LittleEndian>(vector.y.0)?;
Ok(8)
}
StructPropertyValue::Vector2D(vector) => {
validate!(
Expand All @@ -286,6 +287,7 @@ impl PropertyTrait for StructProperty {
);
cursor.write_f64::<LittleEndian>(vector.x.0)?;
cursor.write_f64::<LittleEndian>(vector.y.0)?;
Ok(16)
}
StructPropertyValue::VectorF(vector) => {
validate!(
Expand Down

0 comments on commit 5d6cf9f

Please sign in to comment.