Skip to content

Commit

Permalink
Merge pull request #2409 from maximevtush:main
Browse files Browse the repository at this point in the history
PiperOrigin-RevId: 724879879
Change-Id: I5e65c1892d7160690f6f1d5ae7ddab5f7d46d02b
  • Loading branch information
copybara-github committed Feb 9, 2025
2 parents f73f0e1 + 5874c8a commit 694eb6b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions test/xml/xml_native_writer_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1408,7 +1408,7 @@ TEST_F(XMLWriterTest, WriteReadCompare) {

// ---------------- test CopyBack functionality (decompiler) ------------------
using DecompilerTest = MujocoTest;
TEST_F(DecompilerTest, SavesStatitics) {
TEST_F(DecompilerTest, SavesStatistics) {
static constexpr char xml[] = R"(
<mujoco>
<statistic meansize="2" extent="3" center="4 5 6" meanmass="7" meaninertia="8"/>
Expand All @@ -1432,7 +1432,7 @@ TEST_F(DecompilerTest, SavesStatitics) {
mj_deleteModel(model);
}

TEST_F(DecompilerTest, DoesntSaveInferredStatitics) {
TEST_F(DecompilerTest, DoesntSaveInferredStatistics) {
static constexpr char xml[] = R"(
<mujoco>
<worldbody>
Expand Down
4 changes: 2 additions & 2 deletions unity/Runtime/Importer/MjXmlModifiers.cs
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public void ApplyModifiersToElement(XmlElement element, string elementName=null)
CopyAttributesOverwriteExisting(defaultAncestor, aggregateDefaults);
}
}
// Add the merged attribiutes to the node, without overwriting the existing values.
// Add the merged attributes to the node, without overwriting the existing values.
CopyAttributes(aggregateDefaults, element);
}

Expand Down Expand Up @@ -83,7 +83,7 @@ public static IEnumerable<string> GetApplicableDefaultClasses(XmlElement modifie
while (element != null) {
var className = element.GetStringAttribute("childclass", string.Empty);
if (element == modifiedElement) {
// "class" attribute does not partcipate in building of the inheritance tree, and so we're
// "class" attribute does not participate in building of the inheritance tree, and so we're
// only considering it if it's defined on the very element we're trying to modify.
className = element.GetStringAttribute("class", className);
}
Expand Down

0 comments on commit 694eb6b

Please sign in to comment.