Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix a build issue on Linux with maya<2020 #1013

Merged
merged 1 commit into from
Dec 17, 2020
Merged

Fix a build issue on Linux with maya<2020 #1013

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyShapeUI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,19 @@
//
#include "AL/usdmaya/nodes/ProxyShapeUI.h"

// In Maya-2019 and less, on Linux, Xlib.h will get included
// (from GL/glx.h < MGl.h < M3dView.h < MPxSurfaceShapeUI.h)
// ...and Xlib.h "helpfully" does:
// #define Bool int
// This messes with sdf/types.h:
// SdfValueTypeName Bool;
// So, we #undef bool to get around.
// In Maya-2020+, MGl.h now includes GL/gl.h (not glx.h), which doesn't have
// this annoyance...
#if defined(LINUX) && MAYA_API_VERSION < 20200000 && defined(Bool)
#undef Bool
#endif

#include "AL/usdmaya/DebugCodes.h"
#include "AL/usdmaya/nodes/Engine.h"
#include "AL/usdmaya/nodes/ProxyShape.h"
Expand Down