From 5ab964b720c4b63e2d514553dc328549fdc336c3 Mon Sep 17 00:00:00 2001
From: Jonathan Stone <jstone@lucasfilm.com>
Date: Sun, 6 Oct 2024 18:17:44 -0700
Subject: [PATCH] Use consistent order in C++/Python

---
 .../PyMaterialX/PyMaterialXCore/PyElement.cpp | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/source/PyMaterialX/PyMaterialXCore/PyElement.cpp b/source/PyMaterialX/PyMaterialXCore/PyElement.cpp
index 811fc65a57..eae8a0fcb6 100644
--- a/source/PyMaterialX/PyMaterialXCore/PyElement.cpp
+++ b/source/PyMaterialX/PyMaterialXCore/PyElement.cpp
@@ -26,25 +26,6 @@ namespace mx = MaterialX;
 
 void bindPyElement(py::module& mod)
 {
-    py::class_<mx::ElementEquivalenceResult>(mod, "ElementEquivalenceResult")
-        .def_readonly_static("ATTRIBUTE", &mx::ElementEquivalenceResult::ATTRIBUTE)
-        .def_readonly_static("ATTRIBUTE_NAMES", &mx::ElementEquivalenceResult::ATTRIBUTE_NAMES)
-        .def_readonly_static("CHILD_COUNT", &mx::ElementEquivalenceResult::CHILD_COUNT)
-        .def_readonly_static("CHILD_NAME", &mx::ElementEquivalenceResult::CHILD_NAME)
-        .def_readonly_static("NAME", &mx::ElementEquivalenceResult::NAME)
-        .def_readonly_static("CATEGORY", &mx::ElementEquivalenceResult::CATEGORY)
-        .def_readwrite("path1", &mx::ElementEquivalenceResult::path1)
-        .def_readwrite("path2", &mx::ElementEquivalenceResult::path2)
-        .def_readwrite("differenceType", &mx::ElementEquivalenceResult::differenceType)
-        .def_readwrite("attributeName", &mx::ElementEquivalenceResult::attributeName);
-
-    py::class_<mx::ElementEquivalenceOptions>(mod, "ElementEquivalenceOptions")
-        .def_readwrite("format", &mx::ElementEquivalenceOptions::format)
-        .def_readwrite("precision", &mx::ElementEquivalenceOptions::precision)
-        .def_readwrite("skipAttributes", &mx::ElementEquivalenceOptions::skipAttributes)
-        .def_readwrite("skipValueComparisons", &mx::ElementEquivalenceOptions::skipValueComparisons)
-        .def(py::init<>());
-
     py::class_<mx::Element, mx::ElementPtr>(mod, "Element")
         .def(py::self == py::self)
         .def(py::self != py::self)
@@ -154,6 +135,25 @@ void bindPyElement(py::module& mod)
         BIND_ELEMENT_FUNC_INSTANCE(TypeDef)
         BIND_ELEMENT_FUNC_INSTANCE(Visibility);
 
+    py::class_<mx::ElementEquivalenceResult>(mod, "ElementEquivalenceResult")
+        .def_readonly_static("ATTRIBUTE", &mx::ElementEquivalenceResult::ATTRIBUTE)
+        .def_readonly_static("ATTRIBUTE_NAMES", &mx::ElementEquivalenceResult::ATTRIBUTE_NAMES)
+        .def_readonly_static("CHILD_COUNT", &mx::ElementEquivalenceResult::CHILD_COUNT)
+        .def_readonly_static("CHILD_NAME", &mx::ElementEquivalenceResult::CHILD_NAME)
+        .def_readonly_static("NAME", &mx::ElementEquivalenceResult::NAME)
+        .def_readonly_static("CATEGORY", &mx::ElementEquivalenceResult::CATEGORY)
+        .def_readwrite("path1", &mx::ElementEquivalenceResult::path1)
+        .def_readwrite("path2", &mx::ElementEquivalenceResult::path2)
+        .def_readwrite("differenceType", &mx::ElementEquivalenceResult::differenceType)
+        .def_readwrite("attributeName", &mx::ElementEquivalenceResult::attributeName);
+
+    py::class_<mx::ElementEquivalenceOptions>(mod, "ElementEquivalenceOptions")
+        .def_readwrite("format", &mx::ElementEquivalenceOptions::format)
+        .def_readwrite("precision", &mx::ElementEquivalenceOptions::precision)
+        .def_readwrite("skipAttributes", &mx::ElementEquivalenceOptions::skipAttributes)
+        .def_readwrite("skipValueComparisons", &mx::ElementEquivalenceOptions::skipValueComparisons)
+        .def(py::init<>());
+
     py::class_<mx::TypedElement, mx::TypedElementPtr, mx::Element>(mod, "TypedElement")
         .def("setType", &mx::TypedElement::setType)
         .def("hasType", &mx::TypedElement::hasType)