Merge pull request #43 from BlueSkyStudios/pr/undefAlways

'Always' from X.h conflicts with USD when maya/M3dView.h is included
Autodesk · Oct 1, 2019 · 876e619 · 876e619
2 parents 7312627 + d1c75a9
commit 876e619
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/plugin/pxr/maya/lib/pxrUsdMayaGL/shapeAdapter.h b/plugin/pxr/maya/lib/pxrUsdMayaGL/shapeAdapter.h
@@ -36,6 +36,7 @@
 #include "pxr/usd/sdf/types.h"
 
 #include <maya/M3dView.h>
+#undef Always // Defined in /usr/lib/X11/X.h (eventually included by M3dView.h) - breaks pxr/usd/lib/usdUtils/registeredVariantSet.h
 #include <maya/MBoundingBox.h>
 #include <maya/MColor.h>
 #include <maya/MDagPath.h>