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

[pxr] when loading the pixar plugin, trigger an immediate fail #193

Merged
merged 2 commits into from
Jan 21, 2020
Merged

[pxr] when loading the pixar plugin, trigger an immediate fail #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85010f2
[pxr] when loading the pixar plugin, trigger an immediate fail
Oct 26, 2019
34fe8c3
[al] fix for TestPxrUsdTranslators
Jan 4, 2020
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
2 changes: 1 addition & 1 deletion plugin/al/translators/pxrUsdTranslators/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ add_test(
${AL_INSTALL_PREFIX}
${USD_LIBRARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_INSTALL_PREFIX}/../../plugin/pxr
${CMAKE_INSTALL_PREFIX}/plugin/pxr
)
22 changes: 11 additions & 11 deletions plugin/pxr/maya/plugin/pxrUsd/plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,22 +67,22 @@ initializePlugin(MObject obj)
#endif

status = MayaUsdProxyShapePlugin::initialize(plugin);
CHECK_MSTATUS(status);
CHECK_MSTATUS_AND_RETURN_IT(status);

status = plugin.registerNode(
UsdMayaStageNode::typeName,
UsdMayaStageNode::typeId,
UsdMayaStageNode::creator,
UsdMayaStageNode::initialize);
CHECK_MSTATUS(status);
CHECK_MSTATUS_AND_RETURN_IT(status);

status = plugin.registerNode(
UsdMayaPointBasedDeformerNode::typeName,
UsdMayaPointBasedDeformerNode::typeId,
UsdMayaPointBasedDeformerNode::creator,
UsdMayaPointBasedDeformerNode::initialize,
MPxNode::kDeformerNode);
CHECK_MSTATUS(status);
CHECK_MSTATUS_AND_RETURN_IT(status);

status = plugin.registerShape(
UsdMayaProxyShape::typeName,
Expand All @@ -91,7 +91,7 @@ initializePlugin(MObject obj)
UsdMayaProxyShape::initialize,
UsdMayaProxyShapeUI::creator,
MayaUsdProxyShapePlugin::getProxyShapeClassification());
CHECK_MSTATUS(status);
CHECK_MSTATUS_AND_RETURN_IT(status);

status = plugin.registerNode(
UsdMayaReferenceAssembly::typeName,
Expand All @@ -100,10 +100,10 @@ initializePlugin(MObject obj)
UsdMayaReferenceAssembly::initialize,
MPxNode::kAssembly,
&UsdMayaReferenceAssembly::_classification);
CHECK_MSTATUS(status);
CHECK_MSTATUS_AND_RETURN_IT(status);

status = MGlobal::sourceFile("usdMaya.mel");
CHECK_MSTATUS(status);
CHECK_MSTATUS_AND_RETURN_IT(status);

// Set the label for the assembly node type so that it appears correctly
// in the 'Create -> Scene Assembly' menu.
Expand All @@ -112,23 +112,23 @@ initializePlugin(MObject obj)
status = setLabelCmd.format("assembly -e -type ^1s -label ^2s",
UsdMayaReferenceAssembly::typeName,
assemblyTypeLabel);
CHECK_MSTATUS(status);
CHECK_MSTATUS_AND_RETURN_IT(status);
status = MGlobal::executeCommand(setLabelCmd);
CHECK_MSTATUS(status);
CHECK_MSTATUS_AND_RETURN_IT(status);

// Procs stored in usdMaya.mel
// Add assembly callbacks for accessing data without creating an MPxAssembly instance
status = MGlobal::executeCommand("assembly -e -repTypeLabelProc usdMaya_UsdMayaReferenceAssembly_repTypeLabel -type " + UsdMayaReferenceAssembly::typeName);
CHECK_MSTATUS(status);
CHECK_MSTATUS_AND_RETURN_IT(status);
status = MGlobal::executeCommand("assembly -e -listRepTypesProc usdMaya_UsdMayaReferenceAssembly_listRepTypes -type " + UsdMayaReferenceAssembly::typeName);
CHECK_MSTATUS(status);
CHECK_MSTATUS_AND_RETURN_IT(status);

// Attribute Editor Templates
MString attribEditorCmd(
"from pxr.UsdMaya import AEpxrUsdReferenceAssemblyTemplate\n"
"AEpxrUsdReferenceAssemblyTemplate.addMelFunctionStubs()");
status = MGlobal::executePythonCommand(attribEditorCmd);
CHECK_MSTATUS(status);
CHECK_MSTATUS_AND_RETURN_IT(status);

status = plugin.registerCommand(
"usdExport",
Expand Down