Merge dev with clang format

.clang-format

@@ -53,7 +53,7 @@ IncludeCategories:
   #    Priority 0
 
   # 3. All public headers from this repository (maya-usd)
-  - Regex:           '^<(mayaUsd|hdMaya|AL|usdMaya)/'
+  - Regex:           '^<(mayaUsd.*|hdMaya|AL|usdMaya)/'
     Priority:        3
 
   # 4. Pixar + USD headers

lib/mayaUsd/CMakeLists.txt

@@ -38,13 +38,13 @@ target_compile_definitions(${PROJECT_NAME}
         $<$<STREQUAL:${CMAKE_BUILD_TYPE},Debug>:TBB_USE_DEBUG>
         $<$<STREQUAL:${CMAKE_BUILD_TYPE},Debug>:BOOST_DEBUG_PYTHON>
         $<$<STREQUAL:${CMAKE_BUILD_TYPE},Debug>:BOOST_LINKING_PYTHON>
+        $<$<BOOL:${UFE_FOUND}>:WANT_UFE_BUILD>
     PRIVATE
         MAYAUSD_MACROS_EXPORT
         MAYAUSD_CORE_EXPORT
         MFB_PACKAGE_NAME="${PROJECT_NAME}"
         MFB_ALT_PACKAGE_NAME="${PROJECT_NAME}"
         MFB_PACKAGE_MODULE="${PROJECT_NAME}"
-        $<$<BOOL:${UFE_FOUND}>:WANT_UFE_BUILD>
         $<$<BOOL:${IS_MACOSX}>:OSMac_>
         $<$<BOOL:${IS_LINUX}>:LINUX>
         $<$<BOOL:${IS_LINUX}>:GL_GLEXT_PROTOTYPES>

lib/mayaUsd/base/debugCodes.cpp

@@ -21,16 +21,13 @@ PXR_NAMESPACE_OPEN_SCOPE
 
 TF_REGISTRY_FUNCTION(TfDebug)
 {
-    TF_DEBUG_ENVIRONMENT_SYMBOL(PXRUSDMAYA_REGISTRY,
-            "UsdMaya registration for usd types.");
-    TF_DEBUG_ENVIRONMENT_SYMBOL(PXRUSDMAYA_DIAGNOSTICS,
-            "Debugging of the the diagnostics batching system in UsdMaya.");
-    TF_DEBUG_ENVIRONMENT_SYMBOL(PXRUSDMAYA_TRANSLATORS,
-            "Debugging of translators.");
-    TF_DEBUG_ENVIRONMENT_SYMBOL(USDMAYA_PROXYSHAPEBASE,
-            "Base proxy shape evaluation");
-    TF_DEBUG_ENVIRONMENT_SYMBOL(USDMAYA_PROXYACCESSOR,
-            "Debugging of the evaluation for mixed data models.");
+    TF_DEBUG_ENVIRONMENT_SYMBOL(PXRUSDMAYA_REGISTRY, "UsdMaya registration for usd types.");
+    TF_DEBUG_ENVIRONMENT_SYMBOL(
+        PXRUSDMAYA_DIAGNOSTICS, "Debugging of the the diagnostics batching system in UsdMaya.");
+    TF_DEBUG_ENVIRONMENT_SYMBOL(PXRUSDMAYA_TRANSLATORS, "Debugging of translators.");
+    TF_DEBUG_ENVIRONMENT_SYMBOL(USDMAYA_PROXYSHAPEBASE, "Base proxy shape evaluation");
+    TF_DEBUG_ENVIRONMENT_SYMBOL(
+        USDMAYA_PROXYACCESSOR, "Debugging of the evaluation for mixed data models.");
 }
 
 PXR_NAMESPACE_CLOSE_SCOPE

lib/mayaUsd/base/debugCodes.h

@@ -16,8 +16,8 @@
 #ifndef PXRUSDMAYA_DEBUGCODES_H
 #define PXRUSDMAYA_DEBUGCODES_H
 
-#include <pxr/pxr.h>
 #include <pxr/base/tf/debug.h>
+#include <pxr/pxr.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
@@ -26,8 +26,7 @@ TF_DEBUG_CODES(
     PXRUSDMAYA_DIAGNOSTICS,
     PXRUSDMAYA_TRANSLATORS,
     USDMAYA_PROXYSHAPEBASE,
-    USDMAYA_PROXYACCESSOR
-);
+    USDMAYA_PROXYACCESSOR);
 
 PXR_NAMESPACE_CLOSE_SCOPE