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

Update dev 2 #58

Merged
merged 5 commits into from
Oct 20, 2019
Merged

Update dev 2 #58

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
98624df
Merge pull request #119 from maya3d/merge_public_dev
Sep 17, 2019
62d22ab
Fix VS2017 linker error
Sep 20, 2019
11db6fc
Merge pull request #123 from maya3d/fix_python_wrapper_vs2017_build
Sep 20, 2019
8be671e
Merge remote-tracking branch 'origin_public/dev' into HEAD
Oct 2, 2019
db1d273
Merge remote-tracking branch 'origin/dev' into update_dev_2
Oct 18, 2019
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
15 changes: 14 additions & 1 deletion plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/wrapProxyShape.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,4 +496,17 @@ void wrapProxyShape()
// boost::python::to_python_converter<MBoundingBox, MBoundingBoxConverter>();
}

TF_REFPTR_CONST_VOLATILE_GET(ProxyShape)
// This workaround for a VS compiler bug where we need to explicitly specify
// the conversion to pointer of your our class seems no longer needed for VS2017.
// What it means, is that compiler will properly generate this conversion
// implicitly and cause linker error LNK2005.
//
// In this particular case we got wrapTranslatorContext.obj generating error for
// already defined conversion to a pointer for ProxyShape in wrapProxyShape.obj
//
// The best place to put this fix would be in pxr/base/lib/tf/refPtr.h
// where TF_REFPTR_CONST_VOLATILE_GET is defined, but for now we are
// patching it locally.
#if defined(ARCH_COMPILER_MSVC) && ARCH_COMPILER_MSVC_VERSION <= 1910
TF_REFPTR_CONST_VOLATILE_GET(ProxyShape)
#endif