From e5e10a28d0ba0535e83675399a5d15314fb79ec9 Mon Sep 17 00:00:00 2001 From: Hamed Sabri <48299423+HamedSabri-adsk@users.noreply.github.com> Date: Tue, 23 Jul 2019 17:22:11 -0400 Subject: [PATCH] New repo and install directory design changes (#1) --- CMakeLists.txt | 66 +- Maya-USD.module.template | 25 - README.md | 13 +- build.py | 52 +- cmake/defaults/CXXDefaults.cmake | 22 +- cmake/defaults/CXXHelpers.cmake | 22 +- cmake/defaults/Options.cmake | 22 +- cmake/defaults/Version.cmake | 22 +- cmake/defaults/clangdefaults.cmake | 22 +- cmake/defaults/gccclangshareddefaults.cmake | 22 +- cmake/defaults/gccdefaults.cmake | 22 +- cmake/defaults/msvcdefaults.cmake | 22 +- cmake/mayausd_version.info | 3 - ...indMayaCoreUSD.cmake => FindMayaUSD.cmake} | 15 +- cmake/usd.cmake | 25 +- cmake/utils.cmake | 22 +- core/CMakeLists.txt | 42 - core/CMakeLists_MayaUsd.txt.in | 29 - core/MayaUsd.cmake | 74 -- core/README.md | 1 - core/include/CMakeLists.txt | 3 - core/include/MayaUsd.h.src | 38 - core/include/MayaUsdApi.h | 84 -- core/src/CMakeLists.txt | 62 -- core/src/core.cpp | 5 - {docs => doc}/AL_CONTRIBUTORS.md | 0 ...odeskFormCorpContribAgmtForOpenSource.docx | Bin ...todeskFormIndContribAgmtForOpenSource.docx | Bin {docs => doc}/CONTRIBUTING.md | 0 doc/DEVELOPER.md | 7 + {docs => doc}/LICENSE.md | 0 {docs => doc}/build.md | 39 +- docs/DEVELOPER.md | 8 - lib/README.md | 3 + mayaUSD.mod.template | 18 + .../al}/ALUsdMayaConfig.cmake.in | 0 .../AL_USDMaya => plugin/al}/CMakeLists.txt | 6 +- .../al}/CMakeLists_googletest_download.txt.in | 0 .../al}/CMakeLists_googletest_src.txt.in | 0 {plugins/AL_USDMaya => plugin/al}/LICENSE.txt | 0 {plugins/AL_USDMaya => plugin/al}/README.md | 0 .../al}/docs/animation.md | 0 .../al}/docs/assetresolution.md | 0 .../al}/docs/basicUsage.md | 0 .../AL_USDMaya => plugin/al}/docs/build.md | 0 .../al}/docs/contributing.md | 0 .../al}/docs/developer.md | 0 .../AL_USDMaya => plugin/al}/docs/events.md | 0 .../al}/docs/extraDataTranslatorPlugins.md | 0 {plugins/AL_USDMaya => plugin/al}/docs/faq.md | 0 .../AL_USDMaya => plugin/al}/docs/geometry.md | 0 .../al}/docs/importExport.md | 0 .../AL_USDMaya => plugin/al}/docs/layers.md | 0 .../AL_USDMaya => plugin/al}/docs/lock.md | 0 .../al}/docs/proxyShape.md | 0 .../al}/docs/pxrcomparison.md | 0 .../AL_USDMaya => plugin/al}/docs/python.md | 0 .../al}/docs/schemaTranslatorPlugins.md | 0 .../al}/docs/selection.md | 0 .../AL_USDMaya => plugin/al}/docs/testing.md | 0 .../al}/docs/translation.md | 0 .../al}/docs/workflows.md | 0 .../AL_USDMaya => plugin/al}/doxygen/Doxyfile | 0 .../al}/doxygen/mainpage.dox | 0 .../AL_USDMaya/AL/docpages/docs_codegroups.h | 0 .../lib/AL_USDMaya/AL/docpages/docs_events.h | 0 .../AL_USDMaya/AL/docpages/docs_mayaevents.h | 0 .../AL_USDMaya/AL/docpages/docs_mayahelpers.h | 0 .../AL/docpages/docs_translator_plugins.h | 0 .../al}/lib/AL_USDMaya/AL/usdmaya/Api.h | 2 +- .../lib/AL_USDMaya/AL/usdmaya/CodeTimings.cpp | 2 +- .../lib/AL_USDMaya/AL/usdmaya/CodeTimings.h | 2 +- .../lib/AL_USDMaya/AL/usdmaya/DebugCodes.cpp | 2 +- .../lib/AL_USDMaya/AL/usdmaya/DebugCodes.h | 2 +- .../AL/usdmaya/DrivenTransformsData.cpp | 2 +- .../AL/usdmaya/DrivenTransformsData.h | 2 +- .../AL_USDMaya/AL/usdmaya/ForwardDeclares.h | 2 +- .../al}/lib/AL_USDMaya/AL/usdmaya/Global.cpp | 2 +- .../al}/lib/AL_USDMaya/AL/usdmaya/Global.h | 2 +- .../lib/AL_USDMaya/AL/usdmaya/Metadata.cpp | 2 +- .../al}/lib/AL_USDMaya/AL/usdmaya/Metadata.h | 2 +- .../AL_USDMaya/AL/usdmaya/PluginRegister.h | 10 +- .../AL_USDMaya/AL/usdmaya/SelectabilityDB.cpp | 0 .../AL_USDMaya/AL/usdmaya/SelectabilityDB.h | 0 .../lib/AL_USDMaya/AL/usdmaya/StageCache.cpp | 2 +- .../lib/AL_USDMaya/AL/usdmaya/StageCache.h | 2 +- .../lib/AL_USDMaya/AL/usdmaya/StageData.cpp | 2 +- .../al}/lib/AL_USDMaya/AL/usdmaya/StageData.h | 2 +- .../AL/usdmaya/TransformOperation.cpp | 2 +- .../AL/usdmaya/TransformOperation.h | 2 +- .../al}/lib/AL_USDMaya/AL/usdmaya/TypeIDs.h | 2 +- .../al}/lib/AL_USDMaya/AL/usdmaya/Version.h | 3 +- .../AL/usdmaya/cmds/CreateUsdPrim.cpp | 0 .../AL/usdmaya/cmds/CreateUsdPrim.h | 2 +- .../AL/usdmaya/cmds/DebugCommands.cpp | 2 +- .../AL/usdmaya/cmds/DebugCommands.h | 2 +- .../AL/usdmaya/cmds/EventCommand.cpp | 2 +- .../AL_USDMaya/AL/usdmaya/cmds/EventCommand.h | 2 +- .../AL/usdmaya/cmds/LayerCommands.cpp | 2 +- .../AL/usdmaya/cmds/LayerCommands.h | 2 +- .../AL/usdmaya/cmds/ProxyShapeCommands.cpp | 2 +- .../AL/usdmaya/cmds/ProxyShapeCommands.h | 2 +- .../cmds/ProxyShapePostLoadProcess.cpp | 2 +- .../usdmaya/cmds/ProxyShapePostLoadProcess.h | 2 +- .../usdmaya/cmds/ProxyShapeSelectCommands.cpp | 2 +- .../usdmaya/cmds/ProxyShapeSelectCommands.h | 2 +- .../AL/usdmaya/cmds/RendererCommands.cpp | 2 +- .../AL/usdmaya/cmds/RendererCommands.h | 2 +- .../AL_USDMaya/AL/usdmaya/cmds/UnloadPrim.cpp | 2 +- .../AL_USDMaya/AL/usdmaya/cmds/UnloadPrim.h | 2 +- .../AL/usdmaya/fileio/AnimationTranslator.cpp | 2 +- .../AL/usdmaya/fileio/AnimationTranslator.h | 2 +- .../AL_USDMaya/AL/usdmaya/fileio/Export.cpp | 2 +- .../lib/AL_USDMaya/AL/usdmaya/fileio/Export.h | 2 +- .../AL/usdmaya/fileio/ExportParams.h | 2 +- .../AL/usdmaya/fileio/ExportTranslator.cpp | 2 +- .../AL/usdmaya/fileio/ExportTranslator.h | 2 +- .../AL_USDMaya/AL/usdmaya/fileio/Import.cpp | 2 +- .../lib/AL_USDMaya/AL/usdmaya/fileio/Import.h | 2 +- .../AL/usdmaya/fileio/ImportParams.h | 2 +- .../AL/usdmaya/fileio/ImportTranslator.cpp | 2 +- .../AL/usdmaya/fileio/ImportTranslator.h | 2 +- .../AL/usdmaya/fileio/NodeFactory.cpp | 2 +- .../AL/usdmaya/fileio/NodeFactory.h | 2 +- .../AL/usdmaya/fileio/SchemaPrims.cpp | 2 +- .../AL/usdmaya/fileio/SchemaPrims.h | 2 +- .../AL/usdmaya/fileio/TransformIterator.cpp | 4 +- .../AL/usdmaya/fileio/TransformIterator.h | 2 +- .../fileio/translators/CameraTranslator.cpp | 2 +- .../fileio/translators/DagNodeTranslator.cpp | 2 +- .../fileio/translators/DagNodeTranslator.h | 2 +- .../fileio/translators/DgNodeTranslator.cpp | 2 +- .../fileio/translators/DgNodeTranslator.h | 2 +- .../fileio/translators/ExtraDataPlugin.cpp | 2 +- .../fileio/translators/ExtraDataPlugin.h | 2 +- .../fileio/translators/MeshTranslator.cpp | 2 +- .../translators/NurbsCurveTranslator.cpp | 2 +- .../AL/usdmaya/fileio/translators/README.md | 0 .../translators/TestExtraDataPlugin.cpp | 0 .../fileio/translators/TestExtraDataPlugin.h | 2 +- .../translators/TransformTranslator.cpp | 2 +- .../fileio/translators/TransformTranslator.h | 2 +- .../fileio/translators/TranslatorBase.cpp | 2 +- .../fileio/translators/TranslatorBase.h | 2 +- .../fileio/translators/TranslatorContext.cpp | 2 +- .../fileio/translators/TranslatorContext.h | 2 +- .../translators/TranslatorTestPlugin.cpp | 2 +- .../fileio/translators/TranslatorTestPlugin.h | 2 +- .../fileio/translators/TranslatorTestType.cpp | 2 +- .../fileio/translators/TranslatorTestType.h | 2 +- .../al}/lib/AL_USDMaya/AL/usdmaya/module.cpp | 2 +- .../lib/AL_USDMaya/AL/usdmaya/moduleDeps.cpp | 2 +- .../AL_USDMaya/AL/usdmaya/nodes/Engine.cpp | 2 +- .../lib/AL_USDMaya/AL/usdmaya/nodes/Engine.h | 2 +- .../lib/AL_USDMaya/AL/usdmaya/nodes/Layer.cpp | 2 +- .../lib/AL_USDMaya/AL/usdmaya/nodes/Layer.h | 2 +- .../AL/usdmaya/nodes/LayerManager.cpp | 2 +- .../AL/usdmaya/nodes/LayerManager.h | 2 +- .../AL/usdmaya/nodes/MeshAnimCreator.cpp | 2 +- .../AL/usdmaya/nodes/MeshAnimCreator.h | 2 +- .../AL/usdmaya/nodes/MeshAnimDeformer.cpp | 2 +- .../AL/usdmaya/nodes/MeshAnimDeformer.h | 2 +- .../AL/usdmaya/nodes/ProxyDrawOverride.cpp | 2 +- .../AL/usdmaya/nodes/ProxyDrawOverride.h | 2 +- .../AL/usdmaya/nodes/ProxyShape.cpp | 2 +- .../AL_USDMaya/AL/usdmaya/nodes/ProxyShape.h | 2 +- .../AL/usdmaya/nodes/ProxyShapeSelection.cpp | 2 +- .../AL/usdmaya/nodes/ProxyShapeUI.cpp | 6 +- .../AL/usdmaya/nodes/ProxyShapeUI.h | 2 +- .../AL/usdmaya/nodes/RendererManager.cpp | 2 +- .../AL/usdmaya/nodes/RendererManager.h | 2 +- .../AL_USDMaya/AL/usdmaya/nodes/Transform.cpp | 2 +- .../AL_USDMaya/AL/usdmaya/nodes/Transform.h | 2 +- .../AL/usdmaya/nodes/TransformationMatrix.cpp | 2 +- .../AL/usdmaya/nodes/TransformationMatrix.h | 2 +- .../usdmaya/nodes/proxy/DrivenTransforms.cpp | 0 .../AL/usdmaya/nodes/proxy/DrivenTransforms.h | 2 +- .../AL/usdmaya/nodes/proxy/PrimFilter.cpp | 0 .../AL/usdmaya/nodes/proxy/PrimFilter.h | 2 +- .../AL/usdmaya/nodes/wrapLayerManager.cpp | 2 +- .../AL/usdmaya/nodes/wrapProxyShape.cpp | 2 +- .../AL_USDMaya/AL/usdmaya/wrapStageCache.cpp | 2 +- .../al}/lib/AL_USDMaya/CMakeLists.txt | 0 .../al}/lib/AL_USDMaya/Doxyfile | 0 .../al}/lib/AL_USDMaya/__init__.py | 10 +- .../al}/lib/AL_USDMaya/plugInfo.json | 0 .../al}/lib/CMakeLists.txt | 0 .../al}/mayatest/AL/maya/test/Api.h | 2 +- .../al}/mayatest/AL/maya/test/CMakeLists.txt | 0 .../al}/mayatest/AL/maya/test/testHarness.cpp | 2 +- .../al}/mayatest/AL/maya/test/testHarness.h | 2 +- .../al}/mayatest/AL/maya/test/testHelpers.cpp | 2 +- .../al}/mayatest/AL/maya/test/testHelpers.h | 2 +- .../al}/mayatest/CMakeLists.txt | 0 .../al}/mayautils/AL/maya/CMakeLists.txt | 0 .../al}/mayautils/AL/maya/event/Api.h | 2 +- .../AL/maya/event/MayaEventManager.cpp | 1 + .../AL/maya/event/MayaEventManager.h | 2 +- .../mayautils/AL/maya/tests/CMakeLists.txt | 0 .../maya/tests/mayaplugintest/CMakeLists.txt | 0 .../AL/maya/tests/mayaplugintest/plugin.cpp | 2 +- .../maya/tests/mayaplugintest/run_tests.mel | 0 .../AL/maya/tests/mayaplugintest/run_tests.sh | 0 .../mayaplugintest/test_maya_MenuBuilder.cpp | 2 +- .../mayaplugintest/test_maya_NodeHelper.cpp | 2 +- .../tests/mayaplugintest/test_mobjectmap.cpp | 2 +- .../utils/CommandGuiHelperTest.cpp | 3 +- .../utils/CommandGuiHelperTest.h | 2 +- .../utils/NodeHelperUnitTest.cpp | 4 +- .../mayaplugintest/utils/NodeHelperUnitTest.h | 2 +- .../al}/mayautils/AL/maya/utils/Api.h | 2 +- .../AL/maya/utils/CommandGuiHelper.cpp | 2 +- .../AL/maya/utils/CommandGuiHelper.h | 2 +- .../al}/mayautils/AL/maya/utils/DebugCodes.h | 2 +- .../AL/maya/utils/FileTranslatorBase.h | 2 +- .../AL/maya/utils/FileTranslatorOptions.cpp | 2 +- .../AL/maya/utils/FileTranslatorOptions.h | 2 +- .../mayautils/AL/maya/utils/ForwardDeclares.h | 2 +- .../al}/mayautils/AL/maya/utils/MObjectMap.h | 2 +- .../AL/maya/utils/MayaHelperMacros.h | 0 .../mayautils/AL/maya/utils/MenuBuilder.cpp | 2 +- .../al}/mayautils/AL/maya/utils/MenuBuilder.h | 3 +- .../mayautils/AL/maya/utils/NodeHelper.cpp | 3 +- .../al}/mayautils/AL/maya/utils/NodeHelper.h | 2 +- .../al}/mayautils/AL/maya/utils/Utils.h | 0 .../al}/mayautils/CMakeLists.txt | 0 .../al}/plugin/AL_USDMayaPlugin/Api.h | 2 +- .../plugin/AL_USDMayaPlugin/CMakeLists.txt | 10 +- .../al}/plugin/AL_USDMayaPlugin/plugin.cpp | 2 +- .../AL/maya/test_DiffCore.cpp | 0 .../AL/maya/test_EventHandler.cpp | 0 .../AL/maya/test_MatrixToSRT.cpp | 0 .../AL/maya/test_MayaEventManager.cpp | 2 +- .../usdmaya/commands/test_ExportCommands.cpp | 2 +- .../commands/test_InternalProxySelection.cpp | 2 +- .../usdmaya/commands/test_LayerCommands.cpp | 2 +- .../commands/test_LayerManagerCommands.cpp | 2 +- .../commands/test_ProxyShapeImport.cpp | 2 +- .../commands/test_ProxyShapeSelect.cpp | 2 +- .../commands/test_TranslateCommand.cpp | 0 .../AL/usdmaya/fileio/export_blendshape.cpp | 0 .../AL/usdmaya/fileio/export_constraints.cpp | 0 .../AL/usdmaya/fileio/export_ik.cpp | 0 .../fileio/export_import_instancing.cpp | 0 .../AL/usdmaya/fileio/export_lattice.cpp | 0 .../usdmaya/fileio/export_multiple_shapes.cpp | 0 .../AL/usdmaya/fileio/export_nonlinear.cpp | 0 .../AL/usdmaya/fileio/export_unmerged.cpp | 0 .../nodes/proxy/test_DrivenTransforms.cpp | 2 +- .../usdmaya/nodes/proxy/test_PrimFilter.cpp | 2 +- .../AL/usdmaya/nodes/test_ActiveInactive.cpp | 2 +- .../AL/usdmaya/nodes/test_ExtraDataPlugin.cpp | 2 +- .../AL/usdmaya/nodes/test_LayerManager.cpp | 2 +- .../AL/usdmaya/nodes/test_ProxyShape.cpp | 2 +- .../nodes/test_ProxyShapeSelectabilityDB.cpp | 2 +- .../AL/usdmaya/nodes/test_Transform.cpp | 2 +- .../AL/usdmaya/nodes/test_TransformMatrix.cpp | 2 +- .../usdmaya/nodes/test_TranslatorContext.cpp | 2 +- .../AL/usdmaya/test_DiffPrimVar.cpp | 2 +- .../AL/usdmaya/test_SelectabilityDB.cpp | 2 +- .../al}/plugin/AL_USDMayaTestPlugin/Api.h | 2 +- .../AL_USDMayaTestPlugin/CMakeLists.txt | 10 +- .../plugin/AL_USDMayaTestPlugin/plugin.cpp | 2 +- .../run_mayaplugin_tests.mel | 0 .../run_mayaplugin_tests.sh | 0 .../AL_USDMayaTestPlugin/test_data/cube.usda | 0 .../test_data/cube_moving_zaxis.usda | 0 .../test_data/referencedLayer.usda | 0 .../AL_USDMayaTestPlugin/test_data/root.usda | 0 .../test_data/sphere.usda | 0 .../test_data/sphere2.usda | 0 .../test_data/subLayer.usda | 0 .../test_translators_AnimationTranslator.cpp | 2 +- .../test_translators_CameraTranslator.cpp | 2 +- .../test_translators_DgTranslator.cpp | 2 +- .../test_translators_MeshTranslator.cpp | 2 +- .../test_translators_NurbsCurveTranslator.cpp | 2 +- .../test_translators_TransformTranslator.cpp | 2 +- .../test_translators_Translator.cpp | 2 +- .../AL_USDMayaTestPlugin/test_usdmaya.cpp | 2 +- .../AL_USDMayaTestPlugin/test_usdmaya.h | 2 +- .../test_usdmaya_AttributeType.cpp | 2 +- .../al}/plugin/CMakeLists.txt | 0 .../al}/samples/animatedCamera1.usda | 0 .../al}/samples/colours/faceColours.ma | 0 .../al}/samples/colours/meshColours.usda | 0 .../samples/colours/meshExcludeFromProxy.usda | 0 .../al}/samples/simpleAnimatedCamera1.ma | 0 .../testchar_animallogo01_surfgeo_highres.usd | Bin .../AL/usd/schemas/maya/CMakeLists.txt | 0 .../AL/usd/schemas/maya/FrameRange.cpp | 0 .../schemas/AL/usd/schemas/maya/FrameRange.h | 0 .../AL/usd/schemas/maya/MayaReference.cpp | 0 .../AL/usd/schemas/maya/MayaReference.h | 0 .../schemas/AL/usd/schemas/maya/ModelAPI.cpp | 0 .../schemas/AL/usd/schemas/maya/ModelAPI.h | 0 .../AL/usd/schemas/maya/ModuleDeps.cpp | 0 .../schemas/AL/usd/schemas/maya/__init__.py | 0 .../al}/schemas/AL/usd/schemas/maya/api.h | 0 .../AL/usd/schemas/maya/generatedSchema.usda | 0 .../schemas/AL/usd/schemas/maya/module.cpp | 0 .../AL/usd/schemas/maya/plugInfo.json.in | 0 .../AL/usd/schemas/maya/schema.usda.in | 0 .../AL/usd/schemas/maya/tests/CMakeLists.txt | 0 .../AL/usd/schemas/maya/tests/RunTests.sh | 0 .../AL/usd/schemas/maya/tests/main.cpp | 0 .../schemas/maya/tests/testMayaSchemas.cpp | 0 .../usd/schemas/maya/tests/testModelAPI.cpp | 0 .../schemas/AL/usd/schemas/maya/tokens.cpp | 0 .../al}/schemas/AL/usd/schemas/maya/tokens.h | 0 .../AL/usd/schemas/maya/wrapFrameRange.cpp | 0 .../AL/usd/schemas/maya/wrapMayaReference.cpp | 0 .../AL/usd/schemas/maya/wrapModelAPI.cpp | 0 .../AL/usd/schemas/maya/wrapTokens.cpp | 0 .../al}/schemas/CMakeLists.txt | 0 .../al}/schemas/codegenTemplates/api.h | 0 .../schemas/codegenTemplates/plugInfo.json | 0 .../schemas/codegenTemplates/schemaClass.cpp | 0 .../schemas/codegenTemplates/schemaClass.h | 0 .../al}/schemas/codegenTemplates/tokens.cpp | 0 .../al}/schemas/codegenTemplates/tokens.h | 0 .../codegenTemplates/wrapSchemaClass.cpp | 0 .../schemas/codegenTemplates/wrapTokens.cpp | 0 .../al}/schemas/usd/schema.usda | 0 .../al}/translators/CMakeLists.txt | 11 - .../al}/translators/Camera.cpp | 2 +- .../al}/translators/Camera.h | 2 +- .../al}/translators/DirectionalLight.cpp | 2 +- .../al}/translators/DirectionalLight.h | 2 +- .../al}/translators/FrameRange.cpp | 0 .../al}/translators/FrameRange.h | 2 +- .../al}/translators/MayaReference.cpp | 2 +- .../al}/translators/MayaReference.h | 2 +- .../al}/translators/Mesh.cpp | 0 .../al}/translators/Mesh.h | 2 +- .../al}/translators/NurbsCurve.cpp | 2 +- .../al}/translators/NurbsCurve.h | 2 +- .../al}/translators/README.md | 0 .../al}/translators/plugInfo.json.in | 0 .../pxrUsdTranslators/CMakeLists.txt | 10 +- .../ProxyShapeTranslator.cpp | 2 +- .../pxrUsdTranslators/ProxyShapeTranslator.h | 2 +- .../pxrUsdTranslators/plugInfo.json.in | 0 .../translators/pxrUsdTranslators/plugin.cpp | 2 +- .../pxrUsdTranslators/tests/CMakeLists.txt | 0 .../pxrUsdTranslators/tests/sphere2.usda | 0 .../tests/testPxrTranslators.py | 0 .../tests/testPxrTranslators.sh | 2 +- .../al}/translators/tests/CMakeLists.txt | 0 .../al}/translators/tests/cube.ma | 0 .../al}/translators/tests/sphere.usda | 0 .../tests/testDirectionalLight.usda | 0 .../al}/translators/tests/testFrameRange.usda | 0 .../tests/testFrameRangeCurrentFrame.usda | 0 .../tests/testFrameRangeFallback.usda | 0 .../tests/testFrameRangeNoImpact.usda | 0 .../al}/translators/tests/testMayaRef.usda | 0 .../translators/tests/testMayaRefLoading.usda | 0 .../tests/testMayaRefUnloadable.usda | 0 .../translators/tests/testMeshVariants.usda | 0 .../testTranslatedPrimDisableClearIssue.usda | 0 .../testTranslatedPrimDisableCrashIssue.usda | 0 .../al}/translators/tests/testTranslators.py | 0 .../al}/translators/tests/testTranslators.sh | 0 .../translators/tests/translatortestutils.py | 0 .../al}/tutorials/endToEndMaya/.gitignore | 0 .../al}/tutorials/endToEndMaya/README.md | 0 .../tutorials/endToEndMaya/USDMayaAnim.png | Bin .../endToEndMaya/USDMayaScreenshotManip.png | Bin .../endToEndMaya/assets/Ball/Ball.ma | 0 .../endToEndMaya/assets/Ball/Ball.maya.usd | Bin .../assets/Ball/Ball.shadingVariants.usda | 0 .../endToEndMaya/assets/Ball/Ball.usd | 0 .../endToEndMaya/assets/Ball/Ball_rig.ma | 0 .../endToEndMaya/assets/Ball/tex/ball1.jpg | Bin .../endToEndMaya/assets/Ball/tex/ball1.tex | Bin .../endToEndMaya/assets/Ball/tex/ball4.jpg | Bin .../endToEndMaya/assets/Ball/tex/ball4.tex | Bin .../endToEndMaya/assets/Ball/tex/ball8.jpg | Bin .../endToEndMaya/assets/Ball/tex/ball8.tex | Bin .../endToEndMaya/assets/Ball/tex/ball9.jpg | Bin .../endToEndMaya/assets/Ball/tex/ball9.tex | Bin .../endToEndMaya/assets/Ball/tex/ballCue.jpg | Bin .../endToEndMaya/assets/Ball/tex/ballCue.tex | Bin .../endToEndMaya/assets/Ball/tex/makeTex | 0 .../endToEndMaya/assets/Table/Table.ma | 0 .../endToEndMaya/assets/Table/Table.maya.usd | Bin .../endToEndMaya/assets/Table/Table.usd | 0 .../endToEndMaya/assets/main_cam.usd | 0 .../tutorials/endToEndMaya/assets/render.exr | Bin .../tutorials/endToEndMaya/assets/shot.usd | 0 .../endToEndMaya/assets/simple.katana | Bin .../endToEndMaya/scripts/create_asset.py | 22 +- .../endToEndMaya/scripts/create_shot.py | 22 +- .../tutorial_scripts/add_set_to_s00.py | 22 +- .../tutorial_scripts/add_shadingVariants.py | 22 +- .../tutorial_scripts/create_Room_set.py | 22 +- .../tutorial_scripts/prep_anim_shot_s00_01.py | 22 +- .../al}/tutorials/frameRanges/README.md | 0 .../frameRanges/assets/frame_range_prim.usda | 0 .../frameRanges/assets/frame_range_stage.usda | 0 .../al}/tutorials/lock/LockPrims.png | Bin .../al}/tutorials/lock/README.md | 0 .../tutorials/lock/assets/lock_hierarchy.usda | 0 .../al}/tutorials/meshTranslation/README.md | 0 .../meshTranslation/ScaledSphere.png | Bin .../al}/tutorials/meshTranslation/Start.png | Bin .../meshTranslation/TranslatedPrim.png | Bin .../meshTranslation/primitive_world.usda | 0 .../tutorials/selectability/AllSelectable.png | Bin .../al}/tutorials/selectability/README.md | 0 .../selectability/SelectablePrims.png | Bin .../tutorials/selectability/assets/cone.abc | Bin .../tutorials/selectability/assets/cube.abc | Bin .../selectability/assets/cylinder.abc | Bin .../assets/selectable_world.usda | 0 .../tutorials/selectability/assets/sphere.abc | Bin .../al}/tutorials/tutorialAssets/cone.usda | 0 .../al}/tutorials/tutorialAssets/cube.usda | 0 .../tutorials/tutorialAssets/cylinder.usda | 0 .../al}/tutorials/tutorialAssets/sphere.usda | 0 .../al}/usdmayautils/AL/usdmaya/utils/Api.h | 2 +- .../AL/usdmaya/utils/AttributeType.cpp | 2 +- .../AL/usdmaya/utils/AttributeType.h | 2 +- .../AL/usdmaya/utils/CMakeLists.txt | 0 .../AL/usdmaya/utils/DgNodeHelper.cpp | 3 +- .../AL/usdmaya/utils/DgNodeHelper.h | 2 +- .../AL/usdmaya/utils/DiffPrimVar.cpp | 2 +- .../AL/usdmaya/utils/DiffPrimVar.h | 2 +- .../AL/usdmaya/utils/ForwardDeclares.h | 0 .../AL/usdmaya/utils/MeshUtils.cpp | 2 + .../usdmayautils/AL/usdmaya/utils/MeshUtils.h | 0 .../AL/usdmaya/utils/NurbsCurveUtils.cpp | 2 + .../AL/usdmaya/utils/NurbsCurveUtils.h | 0 .../usdmayautils/AL/usdmaya/utils/Utils.cpp | 2 +- .../al}/usdmayautils/AL/usdmaya/utils/Utils.h | 2 +- .../al}/usdmayautils/CMakeLists.txt | 0 .../al}/usdutils/AL/usd/utils/ALHalf.h | 2 +- .../al}/usdutils/AL/usd/utils/Api.h | 2 +- .../al}/usdutils/AL/usd/utils/CMakeLists.txt | 0 .../al}/usdutils/AL/usd/utils/DebugCodes.cpp | 2 +- .../al}/usdutils/AL/usd/utils/DebugCodes.h | 2 +- .../al}/usdutils/AL/usd/utils/DiffCore.cpp | 2 +- .../al}/usdutils/AL/usd/utils/DiffCore.h | 2 +- .../usdutils/AL/usd/utils/ForwardDeclares.h | 2 +- .../al}/usdutils/AL/usd/utils/SIMD.h | 2 +- .../al}/usdutils/CMakeLists.txt | 0 .../al}/utils/AL/CMakeLists.txt | 0 .../al}/utils/AL/event/Api.h | 2 +- .../al}/utils/AL/event/CMakeLists.txt | 0 .../al}/utils/AL/event/EventHandler.cpp | 2 +- .../al}/utils/AL/event/EventHandler.h | 2 +- .../al}/utils/CMakeLists.txt | 0 .../PXR_USDMaya => plugin/pxr}/CMakeLists.txt | 6 +- .../PXR_USDMaya => plugin/pxr}/LICENSE.txt | 0 .../pxr}/cmake/macros/Private.cmake | 6 +- .../pxr}/cmake/macros/Public.cmake | 0 .../pxr}/cmake/macros/compilePython.py | 22 +- .../cmake/macros/copyHeaderForBuild.cmake | 0 .../pxr}/cmake/macros/shebang.py | 22 +- .../pxr}/cmake/macros/testWrapper.py | 22 +- .../pxr}/maya/CMakeLists.txt | 4 +- .../third_party => plugin/pxr}/maya/README.md | 0 .../pxr}/maya/lib/CMakeLists.txt | 0 .../pxr}/maya/lib/px_vp20/CMakeLists.txt | 0 plugin/pxr/maya/lib/px_vp20/api.h | 32 + .../pxr}/maya/lib/px_vp20/glslProgram.cpp | 22 +- .../pxr}/maya/lib/px_vp20/glslProgram.h | 22 +- .../pxr}/maya/lib/px_vp20/utils.cpp | 22 +- .../pxr}/maya/lib/px_vp20/utils.h | 22 +- .../pxr}/maya/lib/px_vp20/utils_legacy.cpp | 22 +- .../pxr}/maya/lib/px_vp20/utils_legacy.h | 22 +- .../pxr}/maya/lib/pxrUsdMayaGL/CMakeLists.txt | 0 plugin/pxr/maya/lib/pxrUsdMayaGL/api.h | 32 + .../maya/lib/pxrUsdMayaGL/batchRenderer.cpp | 22 +- .../maya/lib/pxrUsdMayaGL/batchRenderer.h | 22 +- .../pxr}/maya/lib/pxrUsdMayaGL/debugCodes.cpp | 22 +- plugin/pxr/maya/lib/pxrUsdMayaGL/debugCodes.h | 40 + .../hdImagingShapeDrawOverride.cpp | 22 +- .../pxrUsdMayaGL/hdImagingShapeDrawOverride.h | 22 +- .../lib/pxrUsdMayaGL/hdImagingShapeUI.cpp | 22 +- .../maya/lib/pxrUsdMayaGL/hdImagingShapeUI.h | 22 +- .../pxr}/maya/lib/pxrUsdMayaGL/hdRenderer.cpp | 22 +- .../pxr}/maya/lib/pxrUsdMayaGL/hdRenderer.h | 22 +- .../maya/lib/pxrUsdMayaGL/instancerImager.cpp | 22 +- .../maya/lib/pxrUsdMayaGL/instancerImager.h | 22 +- .../pxrUsdMayaGL/instancerShapeAdapter.cpp | 22 +- .../lib/pxrUsdMayaGL/instancerShapeAdapter.h | 22 +- .../lib/pxrUsdMayaGL/proxyDrawOverride.cpp | 22 +- .../maya/lib/pxrUsdMayaGL/proxyDrawOverride.h | 22 +- .../lib/pxrUsdMayaGL/proxyShapeDelegate.cpp | 22 +- .../maya/lib/pxrUsdMayaGL/proxyShapeUI.cpp | 22 +- .../pxr}/maya/lib/pxrUsdMayaGL/proxyShapeUI.h | 22 +- .../pxr}/maya/lib/pxrUsdMayaGL/renderParams.h | 22 +- .../maya/lib/pxrUsdMayaGL/sceneDelegate.cpp | 22 +- .../maya/lib/pxrUsdMayaGL/sceneDelegate.h | 22 +- .../maya/lib/pxrUsdMayaGL/shapeAdapter.cpp | 22 +- .../pxr}/maya/lib/pxrUsdMayaGL/shapeAdapter.h | 22 +- .../lib/pxrUsdMayaGL/softSelectHelper.cpp | 22 +- .../maya/lib/pxrUsdMayaGL/softSelectHelper.h | 22 +- .../lib/pxrUsdMayaGL/usdProxyShapeAdapter.cpp | 22 +- .../lib/pxrUsdMayaGL/usdProxyShapeAdapter.h | 22 +- plugin/pxr/maya/lib/pxrUsdMayaGL/userData.cpp | 45 + .../pxr}/maya/lib/pxrUsdMayaGL/userData.h | 22 +- .../usdMaya/AEpxrUsdProxyShapeTemplate.mel | 0 .../AEpxrUsdReferenceAssemblyTemplate.py | 22 +- .../pxr}/maya/lib/usdMaya/CMakeLists.txt | 240 ++--- .../pxr}/maya/lib/usdMaya/__init__.py | 22 +- .../pxr}/maya/lib/usdMaya/adaptor.cpp | 22 +- .../pxr}/maya/lib/usdMaya/adaptor.h | 22 +- plugin/pxr/maya/lib/usdMaya/api.h | 32 + .../usdMaya/blockSceneModificationContext.cpp | 22 +- .../usdMaya/blockSceneModificationContext.h | 22 +- plugin/pxr/maya/lib/usdMaya/chaser.cpp | 42 + .../pxr}/maya/lib/usdMaya/chaser.h | 22 +- .../pxr}/maya/lib/usdMaya/chaserRegistry.cpp | 22 +- .../pxr}/maya/lib/usdMaya/chaserRegistry.h | 22 +- plugin/pxr/maya/lib/usdMaya/colorSpace.cpp | 33 + .../pxr}/maya/lib/usdMaya/colorSpace.h | 22 +- plugin/pxr/maya/lib/usdMaya/debugCodes.cpp | 32 + plugin/pxr/maya/lib/usdMaya/debugCodes.h | 33 + .../maya/lib/usdMaya/diagnosticDelegate.cpp | 24 +- .../maya/lib/usdMaya/diagnosticDelegate.h | 22 +- .../pxr}/maya/lib/usdMaya/editUtil.cpp | 22 +- .../pxr}/maya/lib/usdMaya/editUtil.h | 22 +- .../pxr}/maya/lib/usdMaya/exportCommand.cpp | 22 +- plugin/pxr/maya/lib/usdMaya/exportCommand.h | 51 + .../maya/lib/usdMaya/exportTranslator.cpp | 22 +- .../pxr}/maya/lib/usdMaya/exportTranslator.h | 22 +- .../maya/lib/usdMaya/fallbackPrimReader.cpp | 22 +- .../pxr/maya/lib/usdMaya/fallbackPrimReader.h | 39 + .../maya/lib/usdMaya/functorPrimReader.cpp | 22 +- .../pxr}/maya/lib/usdMaya/functorPrimReader.h | 22 +- .../maya/lib/usdMaya/functorPrimWriter.cpp | 22 +- .../pxr}/maya/lib/usdMaya/functorPrimWriter.h | 22 +- .../pxr}/maya/lib/usdMaya/hdImagingShape.cpp | 22 +- .../pxr}/maya/lib/usdMaya/hdImagingShape.h | 22 +- .../pxr}/maya/lib/usdMaya/importCommand.cpp | 22 +- .../pxr}/maya/lib/usdMaya/importCommand.h | 22 +- .../maya/lib/usdMaya/importTranslator.cpp | 22 +- .../pxr}/maya/lib/usdMaya/importTranslator.h | 22 +- .../maya/lib/usdMaya/instancedNodeWriter.cpp | 22 +- .../maya/lib/usdMaya/instancedNodeWriter.h | 22 +- .../pxr}/maya/lib/usdMaya/jobArgs.cpp | 22 +- .../pxr}/maya/lib/usdMaya/jobArgs.h | 22 +- .../lib/usdMaya/listShadingModesCommand.cpp | 22 +- .../lib/usdMaya/listShadingModesCommand.h | 49 + .../pxr}/maya/lib/usdMaya/meshUtil.cpp | 22 +- .../pxr}/maya/lib/usdMaya/meshUtil.h | 22 +- .../maya/lib/usdMaya/modelKindProcessor.cpp | 22 +- .../maya/lib/usdMaya/modelKindProcessor.h | 22 +- plugin/pxr/maya/lib/usdMaya/module.cpp | 36 + .../pxr}/maya/lib/usdMaya/notice.cpp | 22 +- .../pxr}/maya/lib/usdMaya/notice.h | 22 +- .../maya/lib/usdMaya/out_pxrUsdProxyShape.xpm | 0 .../usdMaya/out_pxrUsdReferenceAssembly.xpm | 0 .../pxr}/maya/lib/usdMaya/overview.dox | 0 .../lib/usdMaya/pointBasedDeformerNode.cpp | 22 +- .../maya/lib/usdMaya/pointBasedDeformerNode.h | 22 +- plugin/pxr/maya/lib/usdMaya/primReader.cpp | 41 + .../pxr}/maya/lib/usdMaya/primReader.h | 22 +- .../pxr}/maya/lib/usdMaya/primReaderArgs.cpp | 22 +- .../pxr}/maya/lib/usdMaya/primReaderArgs.h | 22 +- .../maya/lib/usdMaya/primReaderContext.cpp | 22 +- .../pxr}/maya/lib/usdMaya/primReaderContext.h | 22 +- .../maya/lib/usdMaya/primReaderRegistry.cpp | 22 +- .../maya/lib/usdMaya/primReaderRegistry.h | 22 +- .../pxr}/maya/lib/usdMaya/primWriter.cpp | 22 +- .../pxr}/maya/lib/usdMaya/primWriter.h | 22 +- .../pxr}/maya/lib/usdMaya/primWriterArgs.cpp | 22 +- .../pxr}/maya/lib/usdMaya/primWriterArgs.h | 22 +- .../maya/lib/usdMaya/primWriterContext.cpp | 22 +- .../pxr}/maya/lib/usdMaya/primWriterContext.h | 22 +- .../maya/lib/usdMaya/primWriterRegistry.cpp | 22 +- .../maya/lib/usdMaya/primWriterRegistry.h | 22 +- .../pxr}/maya/lib/usdMaya/proxyShape.cpp | 22 +- .../pxr}/maya/lib/usdMaya/proxyShape.h | 22 +- .../pxr}/maya/lib/usdMaya/query.cpp | 22 +- plugin/pxr/maya/lib/usdMaya/query.h | 47 + .../pxr}/maya/lib/usdMaya/readJob.cpp | 22 +- .../pxr}/maya/lib/usdMaya/readJob.h | 22 +- .../lib/usdMaya/readJob_ImportWithProxies.cpp | 22 +- .../pxr}/maya/lib/usdMaya/readUtil.cpp | 22 +- .../pxr}/maya/lib/usdMaya/readUtil.h | 22 +- .../maya/lib/usdMaya/referenceAssembly.cpp | 22 +- .../pxr}/maya/lib/usdMaya/referenceAssembly.h | 22 +- .../pxr}/maya/lib/usdMaya/registryHelper.cpp | 22 +- .../pxr}/maya/lib/usdMaya/registryHelper.h | 22 +- .../pxr}/maya/lib/usdMaya/roundTripUtil.cpp | 22 +- .../pxr}/maya/lib/usdMaya/roundTripUtil.h | 22 +- .../pxr}/maya/lib/usdMaya/shaderWriter.cpp | 22 +- .../pxr}/maya/lib/usdMaya/shaderWriter.h | 22 +- .../lib/usdMaya/shadingModeDisplayColor.cpp | 22 +- .../maya/lib/usdMaya/shadingModeExporter.cpp | 22 +- .../maya/lib/usdMaya/shadingModeExporter.h | 22 +- .../usdMaya/shadingModeExporterContext.cpp | 22 +- .../lib/usdMaya/shadingModeExporterContext.h | 22 +- .../maya/lib/usdMaya/shadingModeImporter.cpp | 22 +- .../maya/lib/usdMaya/shadingModeImporter.h | 22 +- .../maya/lib/usdMaya/shadingModePxrRis.cpp | 22 +- .../lib/usdMaya/shadingModePxrRis_rfm_map.h | 22 +- .../maya/lib/usdMaya/shadingModeRegistry.cpp | 22 +- .../maya/lib/usdMaya/shadingModeRegistry.h | 22 +- .../lib/usdMaya/shadingModeUseRegistry.cpp | 22 +- .../pxr}/maya/lib/usdMaya/shadingUtil.cpp | 22 +- .../pxr}/maya/lib/usdMaya/shadingUtil.h | 22 +- .../lib/usdMaya/skelBindingsProcessor.cpp | 22 +- .../maya/lib/usdMaya/skelBindingsProcessor.h | 22 +- .../pxr}/maya/lib/usdMaya/stageCache.cpp | 22 +- .../pxr}/maya/lib/usdMaya/stageCache.h | 22 +- .../pxr}/maya/lib/usdMaya/stageData.cpp | 22 +- .../pxr}/maya/lib/usdMaya/stageData.h | 22 +- .../pxr}/maya/lib/usdMaya/stageNode.cpp | 22 +- .../pxr}/maya/lib/usdMaya/stageNode.h | 22 +- .../maya/lib/usdMaya/stageNoticeListener.cpp | 22 +- .../maya/lib/usdMaya/stageNoticeListener.h | 22 +- .../DeformingCube.usda | 0 .../UsdExportAsClipTest.ma | 0 .../UsdExportAssemblyTest/AssemblyTest.ma | 0 .../UsdExportAssemblyTest/DummyModel.usda | 0 .../UsdExportAssemblyTest/XformOpModel.usda | 0 .../UsdExportCameraTest.ma | 0 .../UsdExportColorSetsTest.ma | 0 .../UsdExportConnectedTest/visibility.ma | 0 .../UsdExportDisplayColorTest.ma | 0 .../UsdExportEulerFilterTest.ma | 0 .../UsdExportFilterTypesTest.ma | 0 .../UsdExportFrameOffsetTest.ma | 0 .../UsdExportInstancesTest.ma | 0 .../UsdExportLocatorTest/CubeUnderLocator.ma | 0 .../UsdExportLocatorTest/SingleLocator.ma | 0 .../UsdExportMeshTest/UsdExportMeshTest.ma | 0 .../UsdExportNurbsCurveTest.ma | 0 .../UsdExportOverImportTest/CubeModel.usda | 0 .../testenv/UsdExportPackage/BaseModel.usda | 0 .../testenv/UsdExportPackage/PackageTest.ma | 0 .../UsdExportPackage/ReferenceModel.usda | 0 .../usdMaya/testenv/UsdExportPackage/card.png | Bin .../UsdExportParentScopeTest.ma | 0 .../UsdExportParticlesTest.ma | 0 .../UsdExportPointInstancerTest/Cone.usda | 0 .../InstancerTest.ma | 0 .../InstancerTestMash.ma | 0 .../UsdExportPrefTest/UsdExportPrefTest.ma | 0 .../UsdExportRenderLayerModeTest.ma | 0 .../UsdExportRfMLightTest/RfMLightsTest.ma | 0 .../UsdExportSelectionTest.ma | 0 .../InstancedShading.ma | 0 .../NestedInstancedShading.ma | 0 .../RedCube.ma | 0 .../UsdExportShadingModePxrRis/MarbleCube.ma | 0 .../UsdExportSkeleton.ma | 0 .../UsdExportSkeletonAtSceneRoot.ma | 0 .../UsdExportSkeletonWithoutBindPose.ma | 0 .../UsdExportSkeletonWithoutBindPose.usda | 0 .../UsdExportUVSetsTest_Float.ma | 0 .../UsdExportUVSetsTest.ma | 0 .../UsdExportVisibilityDefaultTest.ma | 0 .../UsdImportAsAssemblies/CubeModel.usda | 0 .../UsdImportAsAssemblies/Cubes_set.usda | 0 .../UsdImportCameraTest.usda | 0 .../UsdImportColorSetsTest.usda | 0 .../UsdImportFrameRangeTest/MovingCube.usda | 0 .../testenv/UsdImportMeshTest/Mesh.usda | 0 .../AnimatedCubeModel.usda | 0 .../AnimationLayer.usda | 0 .../CubeModel.usda | 0 .../Cube_set.usda | 0 .../UsdImportRfMLightTest/RfMLightsTest.usda | 0 .../UsdImportSessionLayerTest/Cubes.usda | 0 .../RedCube.usda | 0 .../MarbleCube.usda | 0 .../testenv/UsdImportSkeleton/skelCube.usda | 0 .../UsdImportUVSetsTestWithCreases_Float.usda | 0 .../UsdImportUVSetsTest_Float.usda | 0 .../UsdImportUVSetsTest.usda | 0 .../UsdImportUVSetsTestWithCreases.usda | 0 .../UsdImportXformsTest.usda | 0 .../UsdImportXformsTestRotateAxis.usda | 0 .../UsdImportXformsTest/pivotTests.usda | 0 .../UsdMayaAdaptorGeomTest/UsdAttrs.usda | 0 .../UsdMayaAdaptorMetadataTest/UsdAttrs.usda | 0 .../maya_profile/scripts/userSetup.py | 0 .../CubeWithVariantsModel.usda | 0 .../UsdMayaModelKindProcessorTest/KindTest.ma | 0 .../KindTest.usd | Bin .../KindTestAssembly.ma | 0 .../KindTestAssemblyAndMesh.ma | 0 .../KindTestUsdKindAttr.ma | 0 .../testenv/UsdMayaProxyShape/CubeModel.usda | 0 .../testenv/UsdMayaProxyShape/ProxyShape.ma | 0 .../CubeModel.usda | 0 .../UserExportedAttributesTest.ma | 0 .../ComplexSet.usda | 0 .../CubeModel.usda | 0 .../CubeModel_NoDefaultPrim.usda | 0 .../OneCube_set.usda | 0 .../SetWithModelingVariants_set.usda | 0 .../TwoCubes_set.usda | 0 .../CubeModel.usda | 0 .../UsdReferenceAssemblySelectionTest.ma | 0 .../ExoticTypeNames.usda | 0 .../testenv/testPointBasedDeformerNode.py | 22 +- .../usdMaya/testenv/testUsdExportAsClip.py | 22 +- .../usdMaya/testenv/testUsdExportAssembly.py | 22 +- .../usdMaya/testenv/testUsdExportCamera.py | 22 +- .../usdMaya/testenv/testUsdExportColorSets.py | 22 +- .../usdMaya/testenv/testUsdExportConnected.py | 22 +- .../testenv/testUsdExportDisplayColor.py | 22 +- .../testenv/testUsdExportEulerFilter.py | 22 +- .../testenv/testUsdExportFilterTypes.py | 22 +- .../testenv/testUsdExportFrameOffset.py | 22 +- .../usdMaya/testenv/testUsdExportInstances.py | 22 +- .../usdMaya/testenv/testUsdExportLocator.py | 22 +- .../lib/usdMaya/testenv/testUsdExportMesh.py | 22 +- .../testenv/testUsdExportNurbsCurve.py | 22 +- .../usdMaya/testenv/testUsdExportOpenLayer.py | 23 +- .../testenv/testUsdExportOverImport.py | 22 +- .../usdMaya/testenv/testUsdExportPackage.py | 22 +- .../testenv/testUsdExportParentScope.py | 22 +- .../usdMaya/testenv/testUsdExportParticles.py | 22 +- .../testenv/testUsdExportPointInstancer.py | 22 +- .../lib/usdMaya/testenv/testUsdExportPref.py | 22 +- .../testenv/testUsdExportRenderLayerMode.py | 22 +- .../usdMaya/testenv/testUsdExportRfMLight.py | 22 +- .../usdMaya/testenv/testUsdExportSelection.py | 22 +- .../testenv/testUsdExportShadingInstanced.py | 22 +- .../testUsdExportShadingModeDisplayColor.py | 22 +- .../testenv/testUsdExportShadingModePxrRis.py | 22 +- .../usdMaya/testenv/testUsdExportSkeleton.py | 22 +- .../testenv/testUsdExportStripNamespaces.py | 22 +- .../usdMaya/testenv/testUsdExportUVSets.py | 22 +- .../testenv/testUsdExportVisibilityDefault.py | 22 +- .../testenv/testUsdImportAsAssemblies.py | 22 +- .../usdMaya/testenv/testUsdImportCamera.py | 22 +- .../usdMaya/testenv/testUsdImportColorSets.py | 22 +- .../testenv/testUsdImportFrameRange.py | 22 +- .../lib/usdMaya/testenv/testUsdImportMesh.py | 22 +- .../testUsdImportNestedAssemblyAnimation.py | 22 +- .../usdMaya/testenv/testUsdImportRfMLight.py | 22 +- .../testenv/testUsdImportSessionLayer.py | 22 +- .../testUsdImportShadingModeDisplayColor.py | 22 +- .../testenv/testUsdImportShadingModePxrRis.py | 22 +- .../usdMaya/testenv/testUsdImportSkeleton.py | 22 +- .../usdMaya/testenv/testUsdImportUVSets.py | 22 +- .../usdMaya/testenv/testUsdImportXforms.py | 22 +- .../lib/usdMaya/testenv/testUsdMayaAdaptor.py | 22 +- .../usdMaya/testenv/testUsdMayaAdaptorGeom.py | 22 +- .../testenv/testUsdMayaAdaptorMetadata.py | 22 +- .../lib/usdMaya/testenv/testUsdMayaAppDir.py | 38 + ...estUsdMayaBlockSceneModificationContext.py | 22 +- .../testenv/testUsdMayaDiagnosticDelegate.py | 22 +- .../testUsdMayaGetVariantSetSelections.py | 22 +- .../testenv/testUsdMayaModelKindProcessor.py | 22 +- .../usdMaya/testenv/testUsdMayaProxyShape.py | 22 +- .../testenv/testUsdMayaReadWriteUtils.py | 22 +- .../testUsdMayaReferenceAssemblyEdits.py | 22 +- .../testUsdMayaUserExportedAttributes.py | 22 +- .../usdMaya/testenv/testUsdMayaXformStack.py | 22 +- ...dReferenceAssemblyChangeRepresentations.py | 22 +- .../testUsdReferenceAssemblySelection.py | 22 +- .../testenv/testUsdTranslateTypelessDefs.py | 22 +- .../pxr}/maya/lib/usdMaya/transformWriter.cpp | 22 +- .../pxr}/maya/lib/usdMaya/transformWriter.h | 22 +- .../maya/lib/usdMaya/translatorCamera.cpp | 22 +- .../pxr}/maya/lib/usdMaya/translatorCamera.h | 22 +- .../maya/lib/usdMaya/translatorCurves.cpp | 22 +- .../pxr/maya/lib/usdMaya/translatorCurves.h | 48 + .../pxr}/maya/lib/usdMaya/translatorGprim.cpp | 22 +- .../pxr}/maya/lib/usdMaya/translatorGprim.h | 22 +- .../maya/lib/usdMaya/translatorMaterial.cpp | 22 +- .../maya/lib/usdMaya/translatorMaterial.h | 22 +- .../pxr}/maya/lib/usdMaya/translatorMesh.cpp | 22 +- .../pxr}/maya/lib/usdMaya/translatorMesh.h | 22 +- .../lib/usdMaya/translatorMesh_PrimVars.cpp | 22 +- .../lib/usdMaya/translatorMesh_SubDiv.cpp | 22 +- .../lib/usdMaya/translatorModelAssembly.cpp | 22 +- .../lib/usdMaya/translatorModelAssembly.h | 22 +- .../maya/lib/usdMaya/translatorNurbsPatch.cpp | 22 +- .../maya/lib/usdMaya/translatorNurbsPatch.h | 49 + .../pxr}/maya/lib/usdMaya/translatorPrim.cpp | 22 +- plugin/pxr/maya/lib/usdMaya/translatorPrim.h | 49 + .../maya/lib/usdMaya/translatorRfMLight.cpp | 22 +- .../maya/lib/usdMaya/translatorRfMLight.h | 22 +- .../pxr}/maya/lib/usdMaya/translatorSkel.cpp | 22 +- .../pxr}/maya/lib/usdMaya/translatorSkel.h | 22 +- .../pxr}/maya/lib/usdMaya/translatorUtil.cpp | 22 +- .../pxr}/maya/lib/usdMaya/translatorUtil.h | 22 +- .../maya/lib/usdMaya/translatorXformable.cpp | 22 +- .../maya/lib/usdMaya/translatorXformable.h | 22 +- .../usdMaya/translatorXformable_decompose.cpp | 22 +- .../maya/lib/usdMaya/undoHelperCommand.cpp | 22 +- .../pxr}/maya/lib/usdMaya/undoHelperCommand.h | 22 +- .../pxr}/maya/lib/usdMaya/usdMaya.mel | 0 .../pxr/maya/lib/usdMaya/usdPrimProvider.cpp | 27 + plugin/pxr/maya/lib/usdMaya/usdPrimProvider.h | 40 + .../maya/lib/usdMaya/usdTranslatorExport.mel | 0 .../maya/lib/usdMaya/usdTranslatorImport.mel | 0 .../lib/usdMaya/userExportedAttributesUI.py | 22 +- .../maya/lib/usdMaya/userTaggedAttribute.cpp | 22 +- .../maya/lib/usdMaya/userTaggedAttribute.h | 22 +- .../pxr}/maya/lib/usdMaya/util.cpp | 22 +- .../pxr}/maya/lib/usdMaya/util.h | 22 +- .../pxr}/maya/lib/usdMaya/wrapAdaptor.cpp | 22 +- .../pxr}/maya/lib/usdMaya/wrapAssembly.cpp | 22 +- .../wrapBlockSceneModificationContext.cpp | 22 +- .../pxr}/maya/lib/usdMaya/wrapColorSpace.cpp | 22 +- .../lib/usdMaya/wrapDiagnosticDelegate.cpp | 22 +- .../pxr}/maya/lib/usdMaya/wrapEditUtil.cpp | 22 +- .../pxr}/maya/lib/usdMaya/wrapMeshUtil.cpp | 22 +- plugin/pxr/maya/lib/usdMaya/wrapQuery.cpp | 34 + .../pxr}/maya/lib/usdMaya/wrapReadUtil.cpp | 22 +- .../maya/lib/usdMaya/wrapRoundTripUtil.cpp | 22 +- .../pxr/maya/lib/usdMaya/wrapStageCache.cpp | 42 + .../lib/usdMaya/wrapUserTaggedAttribute.cpp | 22 +- .../pxr}/maya/lib/usdMaya/wrapWriteUtil.cpp | 22 +- .../pxr}/maya/lib/usdMaya/wrapXformStack.cpp | 22 +- .../pxr}/maya/lib/usdMaya/writeJob.cpp | 22 +- .../pxr}/maya/lib/usdMaya/writeJob.h | 22 +- .../pxr}/maya/lib/usdMaya/writeJobContext.cpp | 22 +- .../pxr}/maya/lib/usdMaya/writeJobContext.h | 22 +- .../pxr}/maya/lib/usdMaya/writeUtil.cpp | 22 +- .../pxr}/maya/lib/usdMaya/writeUtil.h | 22 +- .../pxr}/maya/lib/usdMaya/xformStack.cpp | 22 +- .../pxr}/maya/lib/usdMaya/xformStack.h | 22 +- .../pxr}/maya/plugin/CMakeLists.txt | 0 .../pxr}/maya/plugin/pxrUsd/CMakeLists.txt | 4 +- .../pxr}/maya/plugin/pxrUsd/alembicChaser.cpp | 22 +- .../pxr}/maya/plugin/pxrUsd/api.h | 22 +- .../pxr}/maya/plugin/pxrUsd/overview.dox | 0 .../pxr}/maya/plugin/pxrUsd/plugInfo.json | 0 .../pxr}/maya/plugin/pxrUsd/plugin.cpp | 22 +- .../testenv/AlembicChaser/AlembicChaser.ma | 0 .../AlembicChaser/AlembicChaserPrimvars.ma | 0 .../pxrUsd/testenv/testPxrUsdAlembicChaser.py | 22 +- .../pxr/maya/plugin/pxrUsd/usdTranslator.cpp | 34 + .../AEpxrUsdPreviewSurfaceTemplate.mel | 0 .../pxrUsdPreviewSurface/CMakeLists.txt | 4 +- .../maya/plugin/pxrUsdPreviewSurface/api.h | 22 +- .../float4ToFloatW.jinja2.xml | 0 .../pxrUsdPreviewSurface/float4ToFloatW.xml | 0 .../float4ToFloatW_shaderCode.glsl | 0 .../float4ToFloatX.jinja2.xml | 0 .../pxrUsdPreviewSurface/float4ToFloatX.xml | 0 .../float4ToFloatX_shaderCode.glsl | 0 .../float4ToFloatY.jinja2.xml | 0 .../pxrUsdPreviewSurface/float4ToFloatY.xml | 0 .../float4ToFloatY_shaderCode.glsl | 0 .../float4ToFloatZ.jinja2.xml | 0 .../pxrUsdPreviewSurface/float4ToFloatZ.xml | 0 .../float4ToFloatZ_shaderCode.glsl | 0 .../lightingContributions.jinja2.xml | 0 .../lightingContributions.xml | 0 .../plugin/pxrUsdPreviewSurface/overview.dox | 0 .../plugin/pxrUsdPreviewSurface/plugInfo.json | 0 .../plugin/pxrUsdPreviewSurface/plugin.cpp | 22 +- .../pxrUsdPreviewSurfaceGenFragments.py | 22 +- .../PxrUsdPreviewSurfaceDrawTest.ma | 0 ...rUsdPreviewSurfaceDrawTest_value_ramps.png | Bin .../Brazilian_rosewood_pxr128.png | Bin .../Brazilian_rosewood_pxr128_bmp.png | Bin .../PxrUsdPreviewSurfaceExportTest.ma | 0 .../testenv/testPxrUsdPreviewSurfaceDraw.py | 22 +- .../testenv/testPxrUsdPreviewSurfaceExport.py | 22 +- .../usdPreviewSurface.cpp | 22 +- .../pxrUsdPreviewSurface/usdPreviewSurface.h | 22 +- .../usdPreviewSurface.xml | 0 .../usdPreviewSurfaceCombiner.jinja2.xml | 0 .../usdPreviewSurfaceCombiner.xml | 0 .../usdPreviewSurfaceCombiner_shaderCode.glsl | 0 .../usdPreviewSurfaceLighting.jinja2.xml | 0 .../usdPreviewSurfaceLighting.xml | 0 .../usdPreviewSurfaceShadingNodeOverride.cpp | 22 +- .../usdPreviewSurfaceShadingNodeOverride.h | 22 +- .../usdPreviewSurfaceWriter.cpp | 22 +- .../usdPreviewSurfaceWriter.h | 22 +- .../plugin/pxrUsdTranslators/CMakeLists.txt | 8 +- .../pxr}/maya/plugin/pxrUsdTranslators/api.h | 22 +- .../plugin/pxrUsdTranslators/cameraReader.cpp | 41 + .../plugin/pxrUsdTranslators/cameraWriter.cpp | 22 +- .../plugin/pxrUsdTranslators/cameraWriter.h | 22 +- .../pxrUsdTranslators/fileTextureWriter.cpp | 22 +- .../pxrUsdTranslators/fileTextureWriter.h | 22 +- .../pxrUsdTranslators/instancerWriter.cpp | 22 +- .../pxrUsdTranslators/instancerWriter.h | 22 +- .../plugin/pxrUsdTranslators/jointWriter.cpp | 22 +- .../plugin/pxrUsdTranslators/jointWriter.h | 22 +- .../plugin/pxrUsdTranslators/lightReader.cpp | 22 +- .../plugin/pxrUsdTranslators/lightWriter.cpp | 22 +- .../pxrUsdTranslators/locatorWriter.cpp | 22 +- .../plugin/pxrUsdTranslators/locatorWriter.h | 22 +- .../pxrUsdTranslators/materialReader.cpp | 22 +- .../plugin/pxrUsdTranslators/meshReader.cpp | 38 + .../plugin/pxrUsdTranslators/meshWriter.cpp | 22 +- .../plugin/pxrUsdTranslators/meshWriter.h | 22 +- .../pxrUsdTranslators/meshWriter_Primvars.cpp | 22 +- .../pxrUsdTranslators/meshWriter_Skin.cpp | 22 +- .../pxrUsdTranslators/meshWriter_Subdiv.cpp | 22 +- .../pxrUsdTranslators/nurbsCurveWriter.cpp | 22 +- .../pxrUsdTranslators/nurbsCurveWriter.h | 22 +- .../pxrUsdTranslators/nurbsCurvesReader.cpp | 37 + .../pxrUsdTranslators/nurbsPatchReader.cpp | 41 + .../pxrUsdTranslators/nurbsSurfaceWriter.cpp | 22 +- .../pxrUsdTranslators/nurbsSurfaceWriter.h | 22 +- .../plugin/pxrUsdTranslators/overview.dox | 0 .../pxrUsdTranslators/particleWriter.cpp | 22 +- .../plugin/pxrUsdTranslators/particleWriter.h | 22 +- .../plugin/pxrUsdTranslators/plugInfo.json | 0 .../maya/plugin/pxrUsdTranslators/plugin.cpp | 39 + .../plugin/pxrUsdTranslators/scopeReader.cpp | 46 + .../plugin/pxrUsdTranslators/skelReader.cpp | 22 +- .../testenv/ScopeTest/Scopes.usda | 0 .../testenv/testPxrUsdTranslators.py | 40 + .../testenv/testPxrUsdTranslatorsScope.py | 22 +- .../testPxrUsdTranslatorsUnloadReload.py | 22 +- .../plugin/pxrUsdTranslators/xformReader.cpp | 22 +- .../PXR_USDMaya => plugin/pxr}/pxr/pxr.h.in | 0 plugins/ADSK_USDMaya/CMakeLists.txt | 12 - plugins/ADSK_USDMaya/plugin/CMakeLists.txt | 55 -- plugins/ADSK_USDMaya/plugin/plugin.cpp | 24 - plugins/ADSK_USDMaya/python/CMakeLists.txt | 27 - .../python/maya-ufe-usd-plugin.py | 57 -- .../python/ufeScripts/__init__.py | 0 .../python/ufeScripts/usdRunTime.py | 868 ------------------ .../python/ufeScripts/usdSubject.py | 224 ----- .../python/ufeScripts/usdXformOpCmds.py | 325 ------- .../third_party/maya/lib/px_vp20/api.h | 40 - .../third_party/maya/lib/pxrUsdMayaGL/api.h | 40 - .../maya/lib/pxrUsdMayaGL/debugCodes.h | 48 - .../maya/lib/pxrUsdMayaGL/userData.cpp | 53 -- .../third_party/maya/lib/usdMaya/api.h | 40 - .../third_party/maya/lib/usdMaya/chaser.cpp | 50 - .../maya/lib/usdMaya/colorSpace.cpp | 41 - .../maya/lib/usdMaya/debugCodes.cpp | 40 - .../third_party/maya/lib/usdMaya/debugCodes.h | 41 - .../maya/lib/usdMaya/exportCommand.h | 59 -- .../maya/lib/usdMaya/fallbackPrimReader.h | 47 - .../lib/usdMaya/listShadingModesCommand.h | 57 -- .../third_party/maya/lib/usdMaya/module.cpp | 44 - .../maya/lib/usdMaya/primReader.cpp | 49 - .../third_party/maya/lib/usdMaya/query.h | 55 -- .../lib/usdMaya/testenv/testUsdMayaAppDir.py | 46 - .../maya/lib/usdMaya/translatorCurves.h | 56 -- .../maya/lib/usdMaya/translatorNurbsPatch.h | 57 -- .../maya/lib/usdMaya/translatorPrim.h | 57 -- .../maya/lib/usdMaya/usdPrimProvider.cpp | 35 - .../maya/lib/usdMaya/usdPrimProvider.h | 48 - .../maya/lib/usdMaya/wrapQuery.cpp | 42 - .../maya/lib/usdMaya/wrapStageCache.cpp | 50 - .../maya/plugin/pxrUsd/usdTranslator.cpp | 42 - .../plugin/pxrUsdTranslators/cameraReader.cpp | 49 - .../plugin/pxrUsdTranslators/meshReader.cpp | 46 - .../pxrUsdTranslators/nurbsCurvesReader.cpp | 45 - .../pxrUsdTranslators/nurbsPatchReader.cpp | 49 - .../maya/plugin/pxrUsdTranslators/plugin.cpp | 47 - .../plugin/pxrUsdTranslators/scopeReader.cpp | 54 -- .../testenv/testPxrUsdTranslators.py | 48 - 957 files changed, 3884 insertions(+), 8470 deletions(-) delete mode 100644 Maya-USD.module.template delete mode 100644 cmake/mayausd_version.info rename cmake/modules/{FindMayaCoreUSD.cmake => FindMayaUSD.cmake} (90%) delete mode 100644 core/CMakeLists.txt delete mode 100644 core/CMakeLists_MayaUsd.txt.in delete mode 100644 core/MayaUsd.cmake delete mode 100644 core/README.md delete mode 100644 core/include/CMakeLists.txt delete mode 100644 core/include/MayaUsd.h.src delete mode 100644 core/include/MayaUsdApi.h delete mode 100644 core/src/CMakeLists.txt delete mode 100644 core/src/core.cpp rename {docs => doc}/AL_CONTRIBUTORS.md (100%) rename {docs => doc}/AutodeskFormCorpContribAgmtForOpenSource.docx (100%) rename {docs => doc}/AutodeskFormIndContribAgmtForOpenSource.docx (100%) rename {docs => doc}/CONTRIBUTING.md (100%) create mode 100644 doc/DEVELOPER.md rename {docs => doc}/LICENSE.md (100%) rename {docs => doc}/build.md (66%) delete mode 100644 docs/DEVELOPER.md create mode 100644 lib/README.md create mode 100644 mayaUSD.mod.template rename {plugins/AL_USDMaya => plugin/al}/ALUsdMayaConfig.cmake.in (100%) rename {plugins/AL_USDMaya => plugin/al}/CMakeLists.txt (97%) rename {plugins/AL_USDMaya => plugin/al}/CMakeLists_googletest_download.txt.in (100%) rename {plugins/AL_USDMaya => plugin/al}/CMakeLists_googletest_src.txt.in (100%) rename {plugins/AL_USDMaya => plugin/al}/LICENSE.txt (100%) rename {plugins/AL_USDMaya => plugin/al}/README.md (100%) rename {plugins/AL_USDMaya => plugin/al}/docs/animation.md (100%) rename {plugins/AL_USDMaya => plugin/al}/docs/assetresolution.md (100%) rename {plugins/AL_USDMaya => plugin/al}/docs/basicUsage.md (100%) rename {plugins/AL_USDMaya => plugin/al}/docs/build.md (100%) rename {plugins/AL_USDMaya => plugin/al}/docs/contributing.md (100%) rename {plugins/AL_USDMaya => plugin/al}/docs/developer.md (100%) rename {plugins/AL_USDMaya => plugin/al}/docs/events.md (100%) rename {plugins/AL_USDMaya => plugin/al}/docs/extraDataTranslatorPlugins.md (100%) rename {plugins/AL_USDMaya => plugin/al}/docs/faq.md (100%) rename {plugins/AL_USDMaya => plugin/al}/docs/geometry.md (100%) rename {plugins/AL_USDMaya => plugin/al}/docs/importExport.md (100%) rename {plugins/AL_USDMaya => plugin/al}/docs/layers.md (100%) rename {plugins/AL_USDMaya => plugin/al}/docs/lock.md (100%) rename {plugins/AL_USDMaya => plugin/al}/docs/proxyShape.md (100%) rename {plugins/AL_USDMaya => plugin/al}/docs/pxrcomparison.md (100%) rename {plugins/AL_USDMaya => plugin/al}/docs/python.md (100%) rename {plugins/AL_USDMaya => plugin/al}/docs/schemaTranslatorPlugins.md (100%) rename {plugins/AL_USDMaya => plugin/al}/docs/selection.md (100%) rename {plugins/AL_USDMaya => plugin/al}/docs/testing.md (100%) rename {plugins/AL_USDMaya => plugin/al}/docs/translation.md (100%) rename {plugins/AL_USDMaya => plugin/al}/docs/workflows.md (100%) rename {plugins/AL_USDMaya => plugin/al}/doxygen/Doxyfile (100%) rename {plugins/AL_USDMaya => plugin/al}/doxygen/mainpage.dox (100%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/docpages/docs_codegroups.h (100%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/docpages/docs_events.h (100%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/docpages/docs_mayaevents.h (100%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/docpages/docs_mayahelpers.h (100%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/docpages/docs_translator_plugins.h (100%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/Api.h (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/CodeTimings.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/CodeTimings.h (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/DebugCodes.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/DebugCodes.h (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/DrivenTransformsData.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/DrivenTransformsData.h (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/ForwardDeclares.h (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/Global.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/Global.h (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/Metadata.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/Metadata.h (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/PluginRegister.h (98%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/SelectabilityDB.cpp (100%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/SelectabilityDB.h (100%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/StageCache.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/StageCache.h (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/StageData.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/StageData.h (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/TransformOperation.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/TransformOperation.h (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/TypeIDs.h (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/Version.h (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/cmds/CreateUsdPrim.cpp (100%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/cmds/CreateUsdPrim.h (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/cmds/DebugCommands.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/cmds/DebugCommands.h (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/cmds/EventCommand.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/cmds/EventCommand.h (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/cmds/LayerCommands.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/cmds/LayerCommands.h (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/cmds/ProxyShapeCommands.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/cmds/ProxyShapeCommands.h (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/cmds/ProxyShapePostLoadProcess.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/cmds/ProxyShapePostLoadProcess.h (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/cmds/ProxyShapeSelectCommands.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/cmds/ProxyShapeSelectCommands.h (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/cmds/RendererCommands.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/cmds/RendererCommands.h (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/cmds/UnloadPrim.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/cmds/UnloadPrim.h (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/fileio/AnimationTranslator.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/fileio/AnimationTranslator.h (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/fileio/Export.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/fileio/Export.h (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/fileio/ExportParams.h (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/fileio/ExportTranslator.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/fileio/ExportTranslator.h (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/fileio/Import.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/fileio/Import.h (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/fileio/ImportParams.h (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/fileio/ImportTranslator.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/fileio/ImportTranslator.h (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/fileio/NodeFactory.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/fileio/NodeFactory.h (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/fileio/SchemaPrims.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/fileio/SchemaPrims.h (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/fileio/TransformIterator.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/fileio/TransformIterator.h (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/fileio/translators/CameraTranslator.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/fileio/translators/DagNodeTranslator.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/fileio/translators/DagNodeTranslator.h (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/fileio/translators/DgNodeTranslator.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/fileio/translators/DgNodeTranslator.h (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/fileio/translators/ExtraDataPlugin.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/fileio/translators/ExtraDataPlugin.h (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/fileio/translators/MeshTranslator.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/fileio/translators/NurbsCurveTranslator.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/fileio/translators/README.md (100%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TestExtraDataPlugin.cpp (100%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TestExtraDataPlugin.h (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TransformTranslator.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TransformTranslator.h (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorBase.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorBase.h (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorContext.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorContext.h (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorTestPlugin.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorTestPlugin.h (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorTestType.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorTestType.h (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/module.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/moduleDeps.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/nodes/Engine.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/nodes/Engine.h (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/nodes/Layer.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/nodes/Layer.h (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/nodes/LayerManager.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/nodes/LayerManager.h (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/nodes/MeshAnimCreator.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/nodes/MeshAnimCreator.h (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/nodes/MeshAnimDeformer.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/nodes/MeshAnimDeformer.h (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyDrawOverride.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyDrawOverride.h (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyShape.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyShape.h (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyShapeSelection.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyShapeUI.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyShapeUI.h (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/nodes/RendererManager.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/nodes/RendererManager.h (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/nodes/Transform.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/nodes/Transform.h (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/nodes/TransformationMatrix.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/nodes/TransformationMatrix.h (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/nodes/proxy/DrivenTransforms.cpp (100%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/nodes/proxy/DrivenTransforms.h (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/nodes/proxy/PrimFilter.cpp (100%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/nodes/proxy/PrimFilter.h (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/nodes/wrapLayerManager.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/nodes/wrapProxyShape.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/AL/usdmaya/wrapStageCache.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/CMakeLists.txt (100%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/Doxyfile (100%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/__init__.py (97%) rename {plugins/AL_USDMaya => plugin/al}/lib/AL_USDMaya/plugInfo.json (100%) rename {plugins/AL_USDMaya => plugin/al}/lib/CMakeLists.txt (100%) rename {plugins/AL_USDMaya => plugin/al}/mayatest/AL/maya/test/Api.h (99%) rename {plugins/AL_USDMaya => plugin/al}/mayatest/AL/maya/test/CMakeLists.txt (100%) rename {plugins/AL_USDMaya => plugin/al}/mayatest/AL/maya/test/testHarness.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/mayatest/AL/maya/test/testHarness.h (99%) rename {plugins/AL_USDMaya => plugin/al}/mayatest/AL/maya/test/testHelpers.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/mayatest/AL/maya/test/testHelpers.h (99%) rename {plugins/AL_USDMaya => plugin/al}/mayatest/CMakeLists.txt (100%) rename {plugins/AL_USDMaya => plugin/al}/mayautils/AL/maya/CMakeLists.txt (100%) rename {plugins/AL_USDMaya => plugin/al}/mayautils/AL/maya/event/Api.h (99%) rename {plugins/AL_USDMaya => plugin/al}/mayautils/AL/maya/event/MayaEventManager.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/mayautils/AL/maya/event/MayaEventManager.h (99%) rename {plugins/AL_USDMaya => plugin/al}/mayautils/AL/maya/tests/CMakeLists.txt (100%) rename {plugins/AL_USDMaya => plugin/al}/mayautils/AL/maya/tests/mayaplugintest/CMakeLists.txt (100%) rename {plugins/AL_USDMaya => plugin/al}/mayautils/AL/maya/tests/mayaplugintest/plugin.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/mayautils/AL/maya/tests/mayaplugintest/run_tests.mel (100%) rename {plugins/AL_USDMaya => plugin/al}/mayautils/AL/maya/tests/mayaplugintest/run_tests.sh (100%) rename {plugins/AL_USDMaya => plugin/al}/mayautils/AL/maya/tests/mayaplugintest/test_maya_MenuBuilder.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/mayautils/AL/maya/tests/mayaplugintest/test_maya_NodeHelper.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/mayautils/AL/maya/tests/mayaplugintest/test_mobjectmap.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/mayautils/AL/maya/tests/mayaplugintest/utils/CommandGuiHelperTest.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/mayautils/AL/maya/tests/mayaplugintest/utils/CommandGuiHelperTest.h (99%) rename {plugins/AL_USDMaya => plugin/al}/mayautils/AL/maya/tests/mayaplugintest/utils/NodeHelperUnitTest.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/mayautils/AL/maya/tests/mayaplugintest/utils/NodeHelperUnitTest.h (99%) rename {plugins/AL_USDMaya => plugin/al}/mayautils/AL/maya/utils/Api.h (99%) rename {plugins/AL_USDMaya => plugin/al}/mayautils/AL/maya/utils/CommandGuiHelper.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/mayautils/AL/maya/utils/CommandGuiHelper.h (99%) rename {plugins/AL_USDMaya => plugin/al}/mayautils/AL/maya/utils/DebugCodes.h (99%) rename {plugins/AL_USDMaya => plugin/al}/mayautils/AL/maya/utils/FileTranslatorBase.h (99%) rename {plugins/AL_USDMaya => plugin/al}/mayautils/AL/maya/utils/FileTranslatorOptions.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/mayautils/AL/maya/utils/FileTranslatorOptions.h (99%) rename {plugins/AL_USDMaya => plugin/al}/mayautils/AL/maya/utils/ForwardDeclares.h (99%) rename {plugins/AL_USDMaya => plugin/al}/mayautils/AL/maya/utils/MObjectMap.h (99%) rename {plugins/AL_USDMaya => plugin/al}/mayautils/AL/maya/utils/MayaHelperMacros.h (100%) rename {plugins/AL_USDMaya => plugin/al}/mayautils/AL/maya/utils/MenuBuilder.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/mayautils/AL/maya/utils/MenuBuilder.h (99%) rename {plugins/AL_USDMaya => plugin/al}/mayautils/AL/maya/utils/NodeHelper.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/mayautils/AL/maya/utils/NodeHelper.h (99%) rename {plugins/AL_USDMaya => plugin/al}/mayautils/AL/maya/utils/Utils.h (100%) rename {plugins/AL_USDMaya => plugin/al}/mayautils/CMakeLists.txt (100%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaPlugin/Api.h (99%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaPlugin/CMakeLists.txt (81%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaPlugin/plugin.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaTestPlugin/AL/maya/test_DiffCore.cpp (100%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaTestPlugin/AL/maya/test_EventHandler.cpp (100%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaTestPlugin/AL/maya/test_MatrixToSRT.cpp (100%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaTestPlugin/AL/maya/test_MayaEventManager.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaTestPlugin/AL/usdmaya/commands/test_ExportCommands.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaTestPlugin/AL/usdmaya/commands/test_InternalProxySelection.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaTestPlugin/AL/usdmaya/commands/test_LayerCommands.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaTestPlugin/AL/usdmaya/commands/test_LayerManagerCommands.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaTestPlugin/AL/usdmaya/commands/test_ProxyShapeImport.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaTestPlugin/AL/usdmaya/commands/test_ProxyShapeSelect.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaTestPlugin/AL/usdmaya/commands/test_TranslateCommand.cpp (100%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaTestPlugin/AL/usdmaya/fileio/export_blendshape.cpp (100%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaTestPlugin/AL/usdmaya/fileio/export_constraints.cpp (100%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaTestPlugin/AL/usdmaya/fileio/export_ik.cpp (100%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaTestPlugin/AL/usdmaya/fileio/export_import_instancing.cpp (100%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaTestPlugin/AL/usdmaya/fileio/export_lattice.cpp (100%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaTestPlugin/AL/usdmaya/fileio/export_multiple_shapes.cpp (100%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaTestPlugin/AL/usdmaya/fileio/export_nonlinear.cpp (100%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaTestPlugin/AL/usdmaya/fileio/export_unmerged.cpp (100%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/proxy/test_DrivenTransforms.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/proxy/test_PrimFilter.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_ActiveInactive.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_ExtraDataPlugin.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_LayerManager.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_ProxyShape.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_ProxyShapeSelectabilityDB.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_Transform.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_TransformMatrix.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_TranslatorContext.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaTestPlugin/AL/usdmaya/test_DiffPrimVar.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaTestPlugin/AL/usdmaya/test_SelectabilityDB.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaTestPlugin/Api.h (99%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaTestPlugin/CMakeLists.txt (90%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaTestPlugin/plugin.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaTestPlugin/run_mayaplugin_tests.mel (100%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaTestPlugin/run_mayaplugin_tests.sh (100%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaTestPlugin/test_data/cube.usda (100%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaTestPlugin/test_data/cube_moving_zaxis.usda (100%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaTestPlugin/test_data/referencedLayer.usda (100%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaTestPlugin/test_data/root.usda (100%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaTestPlugin/test_data/sphere.usda (100%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaTestPlugin/test_data/sphere2.usda (100%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaTestPlugin/test_data/subLayer.usda (100%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaTestPlugin/test_translators_AnimationTranslator.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaTestPlugin/test_translators_CameraTranslator.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaTestPlugin/test_translators_DgTranslator.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaTestPlugin/test_translators_MeshTranslator.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaTestPlugin/test_translators_NurbsCurveTranslator.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaTestPlugin/test_translators_TransformTranslator.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaTestPlugin/test_translators_Translator.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaTestPlugin/test_usdmaya.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaTestPlugin/test_usdmaya.h (99%) rename {plugins/AL_USDMaya => plugin/al}/plugin/AL_USDMayaTestPlugin/test_usdmaya_AttributeType.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/plugin/CMakeLists.txt (100%) rename {plugins/AL_USDMaya => plugin/al}/samples/animatedCamera1.usda (100%) rename {plugins/AL_USDMaya => plugin/al}/samples/colours/faceColours.ma (100%) rename {plugins/AL_USDMaya => plugin/al}/samples/colours/meshColours.usda (100%) rename {plugins/AL_USDMaya => plugin/al}/samples/colours/meshExcludeFromProxy.usda (100%) rename {plugins/AL_USDMaya => plugin/al}/samples/simpleAnimatedCamera1.ma (100%) rename {plugins/AL_USDMaya => plugin/al}/samples/testchar_animallogo01_surfgeo_highres.usd (100%) rename {plugins/AL_USDMaya => plugin/al}/schemas/AL/usd/schemas/maya/CMakeLists.txt (100%) rename {plugins/AL_USDMaya => plugin/al}/schemas/AL/usd/schemas/maya/FrameRange.cpp (100%) rename {plugins/AL_USDMaya => plugin/al}/schemas/AL/usd/schemas/maya/FrameRange.h (100%) rename {plugins/AL_USDMaya => plugin/al}/schemas/AL/usd/schemas/maya/MayaReference.cpp (100%) rename {plugins/AL_USDMaya => plugin/al}/schemas/AL/usd/schemas/maya/MayaReference.h (100%) rename {plugins/AL_USDMaya => plugin/al}/schemas/AL/usd/schemas/maya/ModelAPI.cpp (100%) rename {plugins/AL_USDMaya => plugin/al}/schemas/AL/usd/schemas/maya/ModelAPI.h (100%) rename {plugins/AL_USDMaya => plugin/al}/schemas/AL/usd/schemas/maya/ModuleDeps.cpp (100%) rename {plugins/AL_USDMaya => plugin/al}/schemas/AL/usd/schemas/maya/__init__.py (100%) rename {plugins/AL_USDMaya => plugin/al}/schemas/AL/usd/schemas/maya/api.h (100%) rename {plugins/AL_USDMaya => plugin/al}/schemas/AL/usd/schemas/maya/generatedSchema.usda (100%) rename {plugins/AL_USDMaya => plugin/al}/schemas/AL/usd/schemas/maya/module.cpp (100%) rename {plugins/AL_USDMaya => plugin/al}/schemas/AL/usd/schemas/maya/plugInfo.json.in (100%) rename {plugins/AL_USDMaya => plugin/al}/schemas/AL/usd/schemas/maya/schema.usda.in (100%) rename {plugins/AL_USDMaya => plugin/al}/schemas/AL/usd/schemas/maya/tests/CMakeLists.txt (100%) rename {plugins/AL_USDMaya => plugin/al}/schemas/AL/usd/schemas/maya/tests/RunTests.sh (100%) rename {plugins/AL_USDMaya => plugin/al}/schemas/AL/usd/schemas/maya/tests/main.cpp (100%) rename {plugins/AL_USDMaya => plugin/al}/schemas/AL/usd/schemas/maya/tests/testMayaSchemas.cpp (100%) rename {plugins/AL_USDMaya => plugin/al}/schemas/AL/usd/schemas/maya/tests/testModelAPI.cpp (100%) rename {plugins/AL_USDMaya => plugin/al}/schemas/AL/usd/schemas/maya/tokens.cpp (100%) rename {plugins/AL_USDMaya => plugin/al}/schemas/AL/usd/schemas/maya/tokens.h (100%) rename {plugins/AL_USDMaya => plugin/al}/schemas/AL/usd/schemas/maya/wrapFrameRange.cpp (100%) rename {plugins/AL_USDMaya => plugin/al}/schemas/AL/usd/schemas/maya/wrapMayaReference.cpp (100%) rename {plugins/AL_USDMaya => plugin/al}/schemas/AL/usd/schemas/maya/wrapModelAPI.cpp (100%) rename {plugins/AL_USDMaya => plugin/al}/schemas/AL/usd/schemas/maya/wrapTokens.cpp (100%) rename {plugins/AL_USDMaya => plugin/al}/schemas/CMakeLists.txt (100%) rename {plugins/AL_USDMaya => plugin/al}/schemas/codegenTemplates/api.h (100%) rename {plugins/AL_USDMaya => plugin/al}/schemas/codegenTemplates/plugInfo.json (100%) rename {plugins/AL_USDMaya => plugin/al}/schemas/codegenTemplates/schemaClass.cpp (100%) rename {plugins/AL_USDMaya => plugin/al}/schemas/codegenTemplates/schemaClass.h (100%) rename {plugins/AL_USDMaya => plugin/al}/schemas/codegenTemplates/tokens.cpp (100%) rename {plugins/AL_USDMaya => plugin/al}/schemas/codegenTemplates/tokens.h (100%) rename {plugins/AL_USDMaya => plugin/al}/schemas/codegenTemplates/wrapSchemaClass.cpp (100%) rename {plugins/AL_USDMaya => plugin/al}/schemas/codegenTemplates/wrapTokens.cpp (100%) rename {plugins/AL_USDMaya => plugin/al}/schemas/usd/schema.usda (100%) rename {plugins/AL_USDMaya => plugin/al}/translators/CMakeLists.txt (90%) rename {plugins/AL_USDMaya => plugin/al}/translators/Camera.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/translators/Camera.h (99%) rename {plugins/AL_USDMaya => plugin/al}/translators/DirectionalLight.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/translators/DirectionalLight.h (99%) rename {plugins/AL_USDMaya => plugin/al}/translators/FrameRange.cpp (100%) rename {plugins/AL_USDMaya => plugin/al}/translators/FrameRange.h (99%) rename {plugins/AL_USDMaya => plugin/al}/translators/MayaReference.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/translators/MayaReference.h (99%) rename {plugins/AL_USDMaya => plugin/al}/translators/Mesh.cpp (100%) rename {plugins/AL_USDMaya => plugin/al}/translators/Mesh.h (99%) rename {plugins/AL_USDMaya => plugin/al}/translators/NurbsCurve.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/translators/NurbsCurve.h (99%) rename {plugins/AL_USDMaya => plugin/al}/translators/README.md (100%) rename {plugins/AL_USDMaya => plugin/al}/translators/plugInfo.json.in (100%) rename {plugins/AL_USDMaya => plugin/al}/translators/pxrUsdTranslators/CMakeLists.txt (86%) rename {plugins/AL_USDMaya => plugin/al}/translators/pxrUsdTranslators/ProxyShapeTranslator.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/translators/pxrUsdTranslators/ProxyShapeTranslator.h (99%) rename {plugins/AL_USDMaya => plugin/al}/translators/pxrUsdTranslators/plugInfo.json.in (100%) rename {plugins/AL_USDMaya => plugin/al}/translators/pxrUsdTranslators/plugin.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/translators/pxrUsdTranslators/tests/CMakeLists.txt (100%) rename {plugins/AL_USDMaya => plugin/al}/translators/pxrUsdTranslators/tests/sphere2.usda (100%) rename {plugins/AL_USDMaya => plugin/al}/translators/pxrUsdTranslators/tests/testPxrTranslators.py (100%) rename {plugins/AL_USDMaya => plugin/al}/translators/pxrUsdTranslators/tests/testPxrTranslators.sh (88%) rename {plugins/AL_USDMaya => plugin/al}/translators/tests/CMakeLists.txt (100%) rename {plugins/AL_USDMaya => plugin/al}/translators/tests/cube.ma (100%) rename {plugins/AL_USDMaya => plugin/al}/translators/tests/sphere.usda (100%) rename {plugins/AL_USDMaya => plugin/al}/translators/tests/testDirectionalLight.usda (100%) rename {plugins/AL_USDMaya => plugin/al}/translators/tests/testFrameRange.usda (100%) rename {plugins/AL_USDMaya => plugin/al}/translators/tests/testFrameRangeCurrentFrame.usda (100%) rename {plugins/AL_USDMaya => plugin/al}/translators/tests/testFrameRangeFallback.usda (100%) rename {plugins/AL_USDMaya => plugin/al}/translators/tests/testFrameRangeNoImpact.usda (100%) rename {plugins/AL_USDMaya => plugin/al}/translators/tests/testMayaRef.usda (100%) rename {plugins/AL_USDMaya => plugin/al}/translators/tests/testMayaRefLoading.usda (100%) rename {plugins/AL_USDMaya => plugin/al}/translators/tests/testMayaRefUnloadable.usda (100%) rename {plugins/AL_USDMaya => plugin/al}/translators/tests/testMeshVariants.usda (100%) rename {plugins/AL_USDMaya => plugin/al}/translators/tests/testTranslatedPrimDisableClearIssue.usda (100%) rename {plugins/AL_USDMaya => plugin/al}/translators/tests/testTranslatedPrimDisableCrashIssue.usda (100%) rename {plugins/AL_USDMaya => plugin/al}/translators/tests/testTranslators.py (100%) rename {plugins/AL_USDMaya => plugin/al}/translators/tests/testTranslators.sh (100%) rename {plugins/AL_USDMaya => plugin/al}/translators/tests/translatortestutils.py (100%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/endToEndMaya/.gitignore (100%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/endToEndMaya/README.md (100%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/endToEndMaya/USDMayaAnim.png (100%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/endToEndMaya/USDMayaScreenshotManip.png (100%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/endToEndMaya/assets/Ball/Ball.ma (100%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/endToEndMaya/assets/Ball/Ball.maya.usd (100%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/endToEndMaya/assets/Ball/Ball.shadingVariants.usda (100%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/endToEndMaya/assets/Ball/Ball.usd (100%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/endToEndMaya/assets/Ball/Ball_rig.ma (100%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/endToEndMaya/assets/Ball/tex/ball1.jpg (100%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/endToEndMaya/assets/Ball/tex/ball1.tex (100%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/endToEndMaya/assets/Ball/tex/ball4.jpg (100%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/endToEndMaya/assets/Ball/tex/ball4.tex (100%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/endToEndMaya/assets/Ball/tex/ball8.jpg (100%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/endToEndMaya/assets/Ball/tex/ball8.tex (100%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/endToEndMaya/assets/Ball/tex/ball9.jpg (100%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/endToEndMaya/assets/Ball/tex/ball9.tex (100%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/endToEndMaya/assets/Ball/tex/ballCue.jpg (100%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/endToEndMaya/assets/Ball/tex/ballCue.tex (100%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/endToEndMaya/assets/Ball/tex/makeTex (100%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/endToEndMaya/assets/Table/Table.ma (100%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/endToEndMaya/assets/Table/Table.maya.usd (100%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/endToEndMaya/assets/Table/Table.usd (100%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/endToEndMaya/assets/main_cam.usd (100%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/endToEndMaya/assets/render.exr (100%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/endToEndMaya/assets/shot.usd (100%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/endToEndMaya/assets/simple.katana (100%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/endToEndMaya/scripts/create_asset.py (79%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/endToEndMaya/scripts/create_shot.py (73%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/endToEndMaya/tutorial_scripts/add_set_to_s00.py (62%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/endToEndMaya/tutorial_scripts/add_shadingVariants.py (81%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/endToEndMaya/tutorial_scripts/create_Room_set.py (81%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/endToEndMaya/tutorial_scripts/prep_anim_shot_s00_01.py (73%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/frameRanges/README.md (100%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/frameRanges/assets/frame_range_prim.usda (100%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/frameRanges/assets/frame_range_stage.usda (100%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/lock/LockPrims.png (100%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/lock/README.md (100%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/lock/assets/lock_hierarchy.usda (100%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/meshTranslation/README.md (100%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/meshTranslation/ScaledSphere.png (100%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/meshTranslation/Start.png (100%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/meshTranslation/TranslatedPrim.png (100%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/meshTranslation/primitive_world.usda (100%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/selectability/AllSelectable.png (100%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/selectability/README.md (100%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/selectability/SelectablePrims.png (100%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/selectability/assets/cone.abc (100%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/selectability/assets/cube.abc (100%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/selectability/assets/cylinder.abc (100%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/selectability/assets/selectable_world.usda (100%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/selectability/assets/sphere.abc (100%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/tutorialAssets/cone.usda (100%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/tutorialAssets/cube.usda (100%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/tutorialAssets/cylinder.usda (100%) rename {plugins/AL_USDMaya => plugin/al}/tutorials/tutorialAssets/sphere.usda (100%) rename {plugins/AL_USDMaya => plugin/al}/usdmayautils/AL/usdmaya/utils/Api.h (99%) rename {plugins/AL_USDMaya => plugin/al}/usdmayautils/AL/usdmaya/utils/AttributeType.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/usdmayautils/AL/usdmaya/utils/AttributeType.h (99%) rename {plugins/AL_USDMaya => plugin/al}/usdmayautils/AL/usdmaya/utils/CMakeLists.txt (100%) rename {plugins/AL_USDMaya => plugin/al}/usdmayautils/AL/usdmaya/utils/DgNodeHelper.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/usdmayautils/AL/usdmaya/utils/DgNodeHelper.h (99%) rename {plugins/AL_USDMaya => plugin/al}/usdmayautils/AL/usdmaya/utils/DiffPrimVar.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/usdmayautils/AL/usdmaya/utils/DiffPrimVar.h (99%) rename {plugins/AL_USDMaya => plugin/al}/usdmayautils/AL/usdmaya/utils/ForwardDeclares.h (100%) rename {plugins/AL_USDMaya => plugin/al}/usdmayautils/AL/usdmaya/utils/MeshUtils.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/usdmayautils/AL/usdmaya/utils/MeshUtils.h (100%) rename {plugins/AL_USDMaya => plugin/al}/usdmayautils/AL/usdmaya/utils/NurbsCurveUtils.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/usdmayautils/AL/usdmaya/utils/NurbsCurveUtils.h (100%) rename {plugins/AL_USDMaya => plugin/al}/usdmayautils/AL/usdmaya/utils/Utils.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/usdmayautils/AL/usdmaya/utils/Utils.h (99%) rename {plugins/AL_USDMaya => plugin/al}/usdmayautils/CMakeLists.txt (100%) rename {plugins/AL_USDMaya => plugin/al}/usdutils/AL/usd/utils/ALHalf.h (99%) rename {plugins/AL_USDMaya => plugin/al}/usdutils/AL/usd/utils/Api.h (99%) rename {plugins/AL_USDMaya => plugin/al}/usdutils/AL/usd/utils/CMakeLists.txt (100%) rename {plugins/AL_USDMaya => plugin/al}/usdutils/AL/usd/utils/DebugCodes.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/usdutils/AL/usd/utils/DebugCodes.h (99%) rename {plugins/AL_USDMaya => plugin/al}/usdutils/AL/usd/utils/DiffCore.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/usdutils/AL/usd/utils/DiffCore.h (99%) rename {plugins/AL_USDMaya => plugin/al}/usdutils/AL/usd/utils/ForwardDeclares.h (99%) rename {plugins/AL_USDMaya => plugin/al}/usdutils/AL/usd/utils/SIMD.h (99%) rename {plugins/AL_USDMaya => plugin/al}/usdutils/CMakeLists.txt (100%) rename {plugins/AL_USDMaya => plugin/al}/utils/AL/CMakeLists.txt (100%) rename {plugins/AL_USDMaya => plugin/al}/utils/AL/event/Api.h (99%) rename {plugins/AL_USDMaya => plugin/al}/utils/AL/event/CMakeLists.txt (100%) rename {plugins/AL_USDMaya => plugin/al}/utils/AL/event/EventHandler.cpp (99%) rename {plugins/AL_USDMaya => plugin/al}/utils/AL/event/EventHandler.h (99%) rename {plugins/AL_USDMaya => plugin/al}/utils/CMakeLists.txt (100%) rename {plugins/PXR_USDMaya => plugin/pxr}/CMakeLists.txt (90%) rename {plugins/PXR_USDMaya => plugin/pxr}/LICENSE.txt (100%) rename {plugins/PXR_USDMaya => plugin/pxr}/cmake/macros/Private.cmake (99%) rename {plugins/PXR_USDMaya => plugin/pxr}/cmake/macros/Public.cmake (100%) rename {plugins/PXR_USDMaya => plugin/pxr}/cmake/macros/compilePython.py (65%) rename {plugins/PXR_USDMaya => plugin/pxr}/cmake/macros/copyHeaderForBuild.cmake (100%) rename {plugins/PXR_USDMaya => plugin/pxr}/cmake/macros/shebang.py (53%) rename {plugins/PXR_USDMaya => plugin/pxr}/cmake/macros/testWrapper.py (92%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/CMakeLists.txt (63%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/README.md (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/CMakeLists.txt (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/px_vp20/CMakeLists.txt (100%) create mode 100644 plugin/pxr/maya/lib/px_vp20/api.h rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/px_vp20/glslProgram.cpp (83%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/px_vp20/glslProgram.h (58%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/px_vp20/utils.cpp (97%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/px_vp20/utils.h (80%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/px_vp20/utils_legacy.cpp (70%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/px_vp20/utils_legacy.h (53%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/pxrUsdMayaGL/CMakeLists.txt (100%) create mode 100644 plugin/pxr/maya/lib/pxrUsdMayaGL/api.h rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/pxrUsdMayaGL/batchRenderer.cpp (98%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/pxrUsdMayaGL/batchRenderer.h (95%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/pxrUsdMayaGL/debugCodes.cpp (55%) create mode 100644 plugin/pxr/maya/lib/pxrUsdMayaGL/debugCodes.h rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/pxrUsdMayaGL/hdImagingShapeDrawOverride.cpp (82%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/pxrUsdMayaGL/hdImagingShapeDrawOverride.h (77%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/pxrUsdMayaGL/hdImagingShapeUI.cpp (74%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/pxrUsdMayaGL/hdImagingShapeUI.h (68%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/pxrUsdMayaGL/hdRenderer.cpp (93%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/pxrUsdMayaGL/hdRenderer.h (83%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/pxrUsdMayaGL/instancerImager.cpp (93%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/pxrUsdMayaGL/instancerImager.h (86%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/pxrUsdMayaGL/instancerShapeAdapter.cpp (94%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/pxrUsdMayaGL/instancerShapeAdapter.h (85%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/pxrUsdMayaGL/proxyDrawOverride.cpp (91%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/pxrUsdMayaGL/proxyDrawOverride.h (75%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/pxrUsdMayaGL/proxyShapeDelegate.cpp (88%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/pxrUsdMayaGL/proxyShapeUI.cpp (87%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/pxrUsdMayaGL/proxyShapeUI.h (73%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/pxrUsdMayaGL/renderParams.h (59%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/pxrUsdMayaGL/sceneDelegate.cpp (95%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/pxrUsdMayaGL/sceneDelegate.h (78%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/pxrUsdMayaGL/shapeAdapter.cpp (95%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/pxrUsdMayaGL/shapeAdapter.h (91%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/pxrUsdMayaGL/softSelectHelper.cpp (77%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/pxrUsdMayaGL/softSelectHelper.h (74%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/pxrUsdMayaGL/usdProxyShapeAdapter.cpp (93%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/pxrUsdMayaGL/usdProxyShapeAdapter.h (83%) create mode 100644 plugin/pxr/maya/lib/pxrUsdMayaGL/userData.cpp rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/pxrUsdMayaGL/userData.h (54%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/AEpxrUsdProxyShapeTemplate.mel (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/AEpxrUsdReferenceAssemblyTemplate.py (91%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/CMakeLists.txt (73%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/__init__.py (84%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/adaptor.cpp (96%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/adaptor.h (96%) create mode 100644 plugin/pxr/maya/lib/usdMaya/api.h rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/blockSceneModificationContext.cpp (53%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/blockSceneModificationContext.h (55%) create mode 100644 plugin/pxr/maya/lib/usdMaya/chaser.cpp rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/chaser.h (71%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/chaserRegistry.cpp (72%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/chaserRegistry.h (82%) create mode 100644 plugin/pxr/maya/lib/usdMaya/colorSpace.cpp rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/colorSpace.h (68%) create mode 100644 plugin/pxr/maya/lib/usdMaya/debugCodes.cpp create mode 100644 plugin/pxr/maya/lib/usdMaya/debugCodes.h rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/diagnosticDelegate.cpp (88%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/diagnosticDelegate.h (82%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/editUtil.cpp (91%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/editUtil.h (79%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/exportCommand.cpp (92%) create mode 100644 plugin/pxr/maya/lib/usdMaya/exportCommand.h rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/exportTranslator.cpp (87%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/exportTranslator.h (67%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/fallbackPrimReader.cpp (60%) create mode 100644 plugin/pxr/maya/lib/usdMaya/fallbackPrimReader.h rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/functorPrimReader.cpp (54%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/functorPrimReader.h (58%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/functorPrimWriter.cpp (73%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/functorPrimWriter.h (68%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/hdImagingShape.cpp (92%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/hdImagingShape.h (80%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/importCommand.cpp (88%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/importCommand.h (53%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/importTranslator.cpp (84%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/importTranslator.h (66%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/instancedNodeWriter.cpp (88%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/instancedNodeWriter.h (62%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/jobArgs.cpp (96%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/jobArgs.h (90%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/listShadingModesCommand.cpp (64%) create mode 100644 plugin/pxr/maya/lib/usdMaya/listShadingModesCommand.h rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/meshUtil.cpp (92%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/meshUtil.h (73%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/modelKindProcessor.cpp (91%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/modelKindProcessor.h (76%) create mode 100644 plugin/pxr/maya/lib/usdMaya/module.cpp rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/notice.cpp (79%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/notice.h (71%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/out_pxrUsdProxyShape.xpm (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/out_pxrUsdReferenceAssembly.xpm (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/overview.dox (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/pointBasedDeformerNode.cpp (87%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/pointBasedDeformerNode.h (73%) create mode 100644 plugin/pxr/maya/lib/usdMaya/primReader.cpp rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/primReader.h (65%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/primReaderArgs.cpp (55%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/primReaderArgs.h (65%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/primReaderContext.cpp (66%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/primReaderContext.h (73%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/primReaderRegistry.cpp (77%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/primReaderRegistry.h (83%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/primWriter.cpp (91%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/primWriter.h (90%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/primWriterArgs.cpp (66%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/primWriterArgs.h (66%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/primWriterContext.cpp (62%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/primWriterContext.h (80%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/primWriterRegistry.cpp (74%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/primWriterRegistry.h (87%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/proxyShape.cpp (97%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/proxyShape.h (89%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/query.cpp (60%) create mode 100644 plugin/pxr/maya/lib/usdMaya/query.h rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/readJob.cpp (94%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/readJob.h (74%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/readJob_ImportWithProxies.cpp (93%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/readUtil.cpp (96%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/readUtil.h (87%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/referenceAssembly.cpp (98%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/referenceAssembly.h (94%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/registryHelper.cpp (90%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/registryHelper.h (74%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/roundTripUtil.cpp (80%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/roundTripUtil.h (70%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/shaderWriter.cpp (55%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/shaderWriter.h (74%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/shadingModeDisplayColor.cpp (93%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/shadingModeExporter.cpp (87%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/shadingModeExporter.h (69%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/shadingModeExporterContext.cpp (94%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/shadingModeExporterContext.h (84%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/shadingModeImporter.cpp (81%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/shadingModeImporter.h (83%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/shadingModePxrRis.cpp (95%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/shadingModePxrRis_rfm_map.h (84%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/shadingModeRegistry.cpp (79%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/shadingModeRegistry.h (75%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/shadingModeUseRegistry.cpp (94%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/shadingUtil.cpp (64%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/shadingUtil.h (70%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/skelBindingsProcessor.cpp (86%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/skelBindingsProcessor.h (64%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/stageCache.cpp (80%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/stageCache.h (62%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/stageData.cpp (69%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/stageData.h (69%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/stageNode.cpp (83%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/stageNode.h (70%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/stageNoticeListener.cpp (67%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/stageNoticeListener.h (70%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/PointBasedDeformerNodeTest/DeformingCube.usda (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdExportAsClipTest/UsdExportAsClipTest.ma (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdExportAssemblyTest/AssemblyTest.ma (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdExportAssemblyTest/DummyModel.usda (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdExportAssemblyTest/XformOpModel.usda (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdExportCameraTest/UsdExportCameraTest.ma (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdExportColorSetsTest/UsdExportColorSetsTest.ma (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdExportConnectedTest/visibility.ma (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdExportDisplayColorTest/UsdExportDisplayColorTest.ma (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdExportEulerFilterTest/UsdExportEulerFilterTest.ma (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdExportFilterTypesTest/UsdExportFilterTypesTest.ma (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdExportFrameOffsetTest/UsdExportFrameOffsetTest.ma (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdExportInstancesTest/UsdExportInstancesTest.ma (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdExportLocatorTest/CubeUnderLocator.ma (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdExportLocatorTest/SingleLocator.ma (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdExportMeshTest/UsdExportMeshTest.ma (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdExportNurbsCurveTest/UsdExportNurbsCurveTest.ma (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdExportOverImportTest/CubeModel.usda (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdExportPackage/BaseModel.usda (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdExportPackage/PackageTest.ma (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdExportPackage/ReferenceModel.usda (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdExportPackage/card.png (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdExportParentScopeTest/UsdExportParentScopeTest.ma (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdExportParticlesTest/UsdExportParticlesTest.ma (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdExportPointInstancerTest/Cone.usda (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdExportPointInstancerTest/InstancerTest.ma (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdExportPointInstancerTest/InstancerTestMash.ma (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdExportPrefTest/UsdExportPrefTest.ma (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdExportRenderLayerModeTest/UsdExportRenderLayerModeTest.ma (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdExportRfMLightTest/RfMLightsTest.ma (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdExportSelectionTest/UsdExportSelectionTest.ma (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdExportShadingInstancedTest/InstancedShading.ma (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdExportShadingInstancedTest/NestedInstancedShading.ma (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdExportShadingModeDisplayColor/RedCube.ma (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdExportShadingModePxrRis/MarbleCube.ma (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdExportSkeletonTest/UsdExportSkeleton.ma (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdExportSkeletonTest/UsdExportSkeletonAtSceneRoot.ma (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdExportSkeletonTest/UsdExportSkeletonWithoutBindPose.ma (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdExportSkeletonTest/baseline/UsdExportSkeletonWithoutBindPose.usda (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdExportUVSetsFloatTest/UsdExportUVSetsTest_Float.ma (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdExportUVSetsTest/UsdExportUVSetsTest.ma (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdExportVisibilityDefaultTest/UsdExportVisibilityDefaultTest.ma (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdImportAsAssemblies/CubeModel.usda (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdImportAsAssemblies/Cubes_set.usda (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdImportCameraTest/UsdImportCameraTest.usda (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdImportColorSetsTest/UsdImportColorSetsTest.usda (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdImportFrameRangeTest/MovingCube.usda (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdImportMeshTest/Mesh.usda (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdImportNestedAssemblyAnimationTest/AnimatedCubeModel.usda (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdImportNestedAssemblyAnimationTest/AnimationLayer.usda (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdImportNestedAssemblyAnimationTest/CubeModel.usda (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdImportNestedAssemblyAnimationTest/Cube_set.usda (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdImportRfMLightTest/RfMLightsTest.usda (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdImportSessionLayerTest/Cubes.usda (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdImportShadingModeDisplayColor/RedCube.usda (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdImportShadingModePxrRis/MarbleCube.usda (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdImportSkeleton/skelCube.usda (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdImportUVSetsFloatTest/UsdImportUVSetsTestWithCreases_Float.usda (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdImportUVSetsFloatTest/UsdImportUVSetsTest_Float.usda (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdImportUVSetsTest/UsdImportUVSetsTest.usda (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdImportUVSetsTest/UsdImportUVSetsTestWithCreases.usda (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdImportXformsTest/UsdImportXformsTest.usda (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdImportXformsTest/UsdImportXformsTestRotateAxis.usda (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdImportXformsTest/pivotTests.usda (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdMayaAdaptorGeomTest/UsdAttrs.usda (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdMayaAdaptorMetadataTest/UsdAttrs.usda (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdMayaAppDirTest/maya_profile/scripts/userSetup.py (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdMayaGetVariantSetSelectionsTest/CubeWithVariantsModel.usda (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdMayaModelKindProcessorTest/KindTest.ma (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdMayaModelKindProcessorTest/KindTest.usd (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdMayaModelKindProcessorTest/KindTestAssembly.ma (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdMayaModelKindProcessorTest/KindTestAssemblyAndMesh.ma (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdMayaModelKindProcessorTest/KindTestUsdKindAttr.ma (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdMayaProxyShape/CubeModel.usda (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdMayaProxyShape/ProxyShape.ma (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdMayaReferenceAssemblyEdits/CubeModel.usda (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdMayaUserExportedAttributesTest/UserExportedAttributesTest.ma (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdReferenceAssemblyChangeRepresentationsTest/ComplexSet.usda (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdReferenceAssemblyChangeRepresentationsTest/CubeModel.usda (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdReferenceAssemblyChangeRepresentationsTest/CubeModel_NoDefaultPrim.usda (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdReferenceAssemblyChangeRepresentationsTest/OneCube_set.usda (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdReferenceAssemblyChangeRepresentationsTest/SetWithModelingVariants_set.usda (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdReferenceAssemblyChangeRepresentationsTest/TwoCubes_set.usda (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdReferenceAssemblySelectionTest/CubeModel.usda (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdReferenceAssemblySelectionTest/UsdReferenceAssemblySelectionTest.ma (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/UsdTranslateTypelessDefs/ExoticTypeNames.usda (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testPointBasedDeformerNode.py (80%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdExportAsClip.py (85%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdExportAssembly.py (78%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdExportCamera.py (93%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdExportColorSets.py (96%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdExportConnected.py (58%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdExportDisplayColor.py (90%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdExportEulerFilter.py (80%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdExportFilterTypes.py (90%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdExportFrameOffset.py (83%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdExportInstances.py (81%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdExportLocator.py (91%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdExportMesh.py (87%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdExportNurbsCurve.py (62%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdExportOpenLayer.py (73%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdExportOverImport.py (69%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdExportPackage.py (81%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdExportParentScope.py (63%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdExportParticles.py (65%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdExportPointInstancer.py (93%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdExportPref.py (68%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdExportRenderLayerMode.py (89%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdExportRfMLight.py (93%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdExportSelection.py (70%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdExportShadingInstanced.py (88%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdExportShadingModeDisplayColor.py (82%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdExportShadingModePxrRis.py (81%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdExportSkeleton.py (86%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdExportStripNamespaces.py (82%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdExportUVSets.py (92%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdExportVisibilityDefault.py (63%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdImportAsAssemblies.py (88%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdImportCamera.py (94%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdImportColorSets.py (96%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdImportFrameRange.py (79%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdImportMesh.py (72%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdImportNestedAssemblyAnimation.py (82%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdImportRfMLight.py (93%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdImportSessionLayer.py (71%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdImportShadingModeDisplayColor.py (75%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdImportShadingModePxrRis.py (78%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdImportSkeleton.py (90%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdImportUVSets.py (93%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdImportXforms.py (91%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdMayaAdaptor.py (93%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdMayaAdaptorGeom.py (71%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdMayaAdaptorMetadata.py (90%) create mode 100644 plugin/pxr/maya/lib/usdMaya/testenv/testUsdMayaAppDir.py rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdMayaBlockSceneModificationContext.py (68%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdMayaDiagnosticDelegate.py (85%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdMayaGetVariantSetSelections.py (77%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdMayaModelKindProcessor.py (84%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdMayaProxyShape.py (73%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdMayaReadWriteUtils.py (89%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdMayaReferenceAssemblyEdits.py (85%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdMayaUserExportedAttributes.py (95%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdMayaXformStack.py (98%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdReferenceAssemblyChangeRepresentations.py (96%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdReferenceAssemblySelection.py (75%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/testenv/testUsdTranslateTypelessDefs.py (82%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/transformWriter.cpp (95%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/transformWriter.h (81%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/translatorCamera.cpp (94%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/translatorCamera.h (57%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/translatorCurves.cpp (91%) create mode 100644 plugin/pxr/maya/lib/usdMaya/translatorCurves.h rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/translatorGprim.cpp (64%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/translatorGprim.h (50%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/translatorMaterial.cpp (90%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/translatorMaterial.h (68%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/translatorMesh.cpp (96%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/translatorMesh.h (63%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/translatorMesh_PrimVars.cpp (94%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/translatorMesh_SubDiv.cpp (92%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/translatorModelAssembly.cpp (95%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/translatorModelAssembly.h (75%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/translatorNurbsPatch.cpp (95%) create mode 100644 plugin/pxr/maya/lib/usdMaya/translatorNurbsPatch.h rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/translatorPrim.cpp (79%) create mode 100644 plugin/pxr/maya/lib/usdMaya/translatorPrim.h rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/translatorRfMLight.cpp (98%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/translatorRfMLight.h (56%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/translatorSkel.cpp (98%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/translatorSkel.h (78%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/translatorUtil.cpp (88%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/translatorUtil.h (85%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/translatorXformable.cpp (94%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/translatorXformable.h (57%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/translatorXformable_decompose.cpp (78%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/undoHelperCommand.cpp (67%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/undoHelperCommand.h (72%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/usdMaya.mel (100%) create mode 100644 plugin/pxr/maya/lib/usdMaya/usdPrimProvider.cpp create mode 100644 plugin/pxr/maya/lib/usdMaya/usdPrimProvider.h rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/usdTranslatorExport.mel (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/usdTranslatorImport.mel (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/userExportedAttributesUI.py (97%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/userTaggedAttribute.cpp (89%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/userTaggedAttribute.h (80%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/util.cpp (98%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/util.h (95%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/wrapAdaptor.cpp (90%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/wrapAssembly.cpp (59%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/wrapBlockSceneModificationContext.cpp (57%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/wrapColorSpace.cpp (57%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/wrapDiagnosticDelegate.cpp (58%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/wrapEditUtil.cpp (89%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/wrapMeshUtil.cpp (65%) create mode 100644 plugin/pxr/maya/lib/usdMaya/wrapQuery.cpp rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/wrapReadUtil.cpp (73%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/wrapRoundTripUtil.cpp (56%) create mode 100644 plugin/pxr/maya/lib/usdMaya/wrapStageCache.cpp rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/wrapUserTaggedAttribute.cpp (73%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/wrapWriteUtil.cpp (53%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/wrapXformStack.cpp (90%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/writeJob.cpp (97%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/writeJob.h (75%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/writeJobContext.cpp (95%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/writeJobContext.h (90%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/writeUtil.cpp (98%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/writeUtil.h (92%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/xformStack.cpp (96%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/lib/usdMaya/xformStack.h (92%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/CMakeLists.txt (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsd/CMakeLists.txt (83%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsd/alembicChaser.cpp (93%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsd/api.h (50%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsd/overview.dox (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsd/plugInfo.json (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsd/plugin.cpp (90%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsd/testenv/AlembicChaser/AlembicChaser.ma (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsd/testenv/AlembicChaser/AlembicChaserPrimvars.ma (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsd/testenv/testPxrUsdAlembicChaser.py (84%) create mode 100644 plugin/pxr/maya/plugin/pxrUsd/usdTranslator.cpp rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdPreviewSurface/AEpxrUsdPreviewSurfaceTemplate.mel (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdPreviewSurface/CMakeLists.txt (93%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdPreviewSurface/api.h (54%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdPreviewSurface/float4ToFloatW.jinja2.xml (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdPreviewSurface/float4ToFloatW.xml (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdPreviewSurface/float4ToFloatW_shaderCode.glsl (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdPreviewSurface/float4ToFloatX.jinja2.xml (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdPreviewSurface/float4ToFloatX.xml (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdPreviewSurface/float4ToFloatX_shaderCode.glsl (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdPreviewSurface/float4ToFloatY.jinja2.xml (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdPreviewSurface/float4ToFloatY.xml (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdPreviewSurface/float4ToFloatY_shaderCode.glsl (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdPreviewSurface/float4ToFloatZ.jinja2.xml (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdPreviewSurface/float4ToFloatZ.xml (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdPreviewSurface/float4ToFloatZ_shaderCode.glsl (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdPreviewSurface/lightingContributions.jinja2.xml (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdPreviewSurface/lightingContributions.xml (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdPreviewSurface/overview.dox (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdPreviewSurface/plugInfo.json (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdPreviewSurface/plugin.cpp (88%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdPreviewSurface/pxrUsdPreviewSurfaceGenFragments.py (92%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdPreviewSurface/testenv/PxrUsdPreviewSurfaceDrawTest/PxrUsdPreviewSurfaceDrawTest.ma (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdPreviewSurface/testenv/PxrUsdPreviewSurfaceDrawTest/baseline/PxrUsdPreviewSurfaceDrawTest_value_ramps.png (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdPreviewSurface/testenv/PxrUsdPreviewSurfaceExportTest/Brazilian_rosewood_pxr128.png (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdPreviewSurface/testenv/PxrUsdPreviewSurfaceExportTest/Brazilian_rosewood_pxr128_bmp.png (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdPreviewSurface/testenv/PxrUsdPreviewSurfaceExportTest/PxrUsdPreviewSurfaceExportTest.ma (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdPreviewSurface/testenv/testPxrUsdPreviewSurfaceDraw.py (77%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdPreviewSurface/testenv/testPxrUsdPreviewSurfaceExport.py (89%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurface.cpp (94%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurface.h (80%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurface.xml (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceCombiner.jinja2.xml (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceCombiner.xml (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceCombiner_shaderCode.glsl (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceLighting.jinja2.xml (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceLighting.xml (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceShadingNodeOverride.cpp (74%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceShadingNodeOverride.h (73%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceWriter.cpp (92%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceWriter.h (53%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdTranslators/CMakeLists.txt (83%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdTranslators/api.h (53%) create mode 100644 plugin/pxr/maya/plugin/pxrUsdTranslators/cameraReader.cpp rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdTranslators/cameraWriter.cpp (86%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdTranslators/cameraWriter.h (53%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdTranslators/fileTextureWriter.cpp (93%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdTranslators/fileTextureWriter.h (54%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdTranslators/instancerWriter.cpp (94%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdTranslators/instancerWriter.h (76%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdTranslators/jointWriter.cpp (96%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdTranslators/jointWriter.h (76%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdTranslators/lightReader.cpp (63%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdTranslators/lightWriter.cpp (57%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdTranslators/locatorWriter.cpp (60%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdTranslators/locatorWriter.h (60%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdTranslators/materialReader.cpp (50%) create mode 100644 plugin/pxr/maya/plugin/pxrUsdTranslators/meshReader.cpp rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdTranslators/meshWriter.cpp (95%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdTranslators/meshWriter.h (88%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdTranslators/meshWriter_Primvars.cpp (96%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdTranslators/meshWriter_Skin.cpp (94%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdTranslators/meshWriter_Subdiv.cpp (82%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdTranslators/nurbsCurveWriter.cpp (88%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdTranslators/nurbsCurveWriter.h (56%) create mode 100644 plugin/pxr/maya/plugin/pxrUsdTranslators/nurbsCurvesReader.cpp create mode 100644 plugin/pxr/maya/plugin/pxrUsdTranslators/nurbsPatchReader.cpp rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdTranslators/nurbsSurfaceWriter.cpp (94%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdTranslators/nurbsSurfaceWriter.h (56%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdTranslators/overview.dox (100%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdTranslators/particleWriter.cpp (93%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdTranslators/particleWriter.h (59%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdTranslators/plugInfo.json (100%) create mode 100644 plugin/pxr/maya/plugin/pxrUsdTranslators/plugin.cpp create mode 100644 plugin/pxr/maya/plugin/pxrUsdTranslators/scopeReader.cpp rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdTranslators/skelReader.cpp (88%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdTranslators/testenv/ScopeTest/Scopes.usda (100%) create mode 100644 plugin/pxr/maya/plugin/pxrUsdTranslators/testenv/testPxrUsdTranslators.py rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdTranslators/testenv/testPxrUsdTranslatorsScope.py (81%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdTranslators/testenv/testPxrUsdTranslatorsUnloadReload.py (60%) rename {plugins/PXR_USDMaya/third_party => plugin/pxr}/maya/plugin/pxrUsdTranslators/xformReader.cpp (53%) rename {plugins/PXR_USDMaya => plugin/pxr}/pxr/pxr.h.in (100%) delete mode 100644 plugins/ADSK_USDMaya/CMakeLists.txt delete mode 100644 plugins/ADSK_USDMaya/plugin/CMakeLists.txt delete mode 100644 plugins/ADSK_USDMaya/plugin/plugin.cpp delete mode 100644 plugins/ADSK_USDMaya/python/CMakeLists.txt delete mode 100644 plugins/ADSK_USDMaya/python/maya-ufe-usd-plugin.py delete mode 100644 plugins/ADSK_USDMaya/python/ufeScripts/__init__.py delete mode 100644 plugins/ADSK_USDMaya/python/ufeScripts/usdRunTime.py delete mode 100644 plugins/ADSK_USDMaya/python/ufeScripts/usdSubject.py delete mode 100644 plugins/ADSK_USDMaya/python/ufeScripts/usdXformOpCmds.py delete mode 100644 plugins/PXR_USDMaya/third_party/maya/lib/px_vp20/api.h delete mode 100644 plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/api.h delete mode 100644 plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/debugCodes.h delete mode 100644 plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/userData.cpp delete mode 100644 plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/api.h delete mode 100644 plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/chaser.cpp delete mode 100644 plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/colorSpace.cpp delete mode 100644 plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/debugCodes.cpp delete mode 100644 plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/debugCodes.h delete mode 100644 plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/exportCommand.h delete mode 100644 plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/fallbackPrimReader.h delete mode 100644 plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/listShadingModesCommand.h delete mode 100644 plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/module.cpp delete mode 100644 plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/primReader.cpp delete mode 100644 plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/query.h delete mode 100644 plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdMayaAppDir.py delete mode 100644 plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorCurves.h delete mode 100644 plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorNurbsPatch.h delete mode 100644 plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorPrim.h delete mode 100644 plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/usdPrimProvider.cpp delete mode 100644 plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/usdPrimProvider.h delete mode 100644 plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/wrapQuery.cpp delete mode 100644 plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/wrapStageCache.cpp delete mode 100644 plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsd/usdTranslator.cpp delete mode 100644 plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/cameraReader.cpp delete mode 100644 plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/meshReader.cpp delete mode 100644 plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/nurbsCurvesReader.cpp delete mode 100644 plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/nurbsPatchReader.cpp delete mode 100644 plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/plugin.cpp delete mode 100644 plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/scopeReader.cpp delete mode 100644 plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/testenv/testPxrUsdTranslators.py diff --git a/CMakeLists.txt b/CMakeLists.txt index 02b144a897..fd89a0f731 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,13 +1,19 @@ #- -#***************************************************************************** +# ======================================================================= # Copyright 2019 Autodesk, Inc. All rights reserved. # -# These coded instructions, statements, and computer programs contain -# unpublished proprietary information written by Autodesk, Inc. and are -# protected by Federal copyright law. They may not be disclosed to third -# parties or copied or duplicated in any form, in whole or in part, without -# the prior written consent of Autodesk, Inc. -#***************************************************************************** +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at + +# http://www.apache.org/licenses/LICENSE-2.0 + +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ======================================================================= #+ cmake_minimum_required(VERSION 3.1.1) @@ -15,10 +21,8 @@ cmake_minimum_required(VERSION 3.1.1) #============================================================================== # Define common build variables #============================================================================== -set(BUILD_MAYAUSD_CORE_LIBRARY ON CACHE BOOL "Build Core USD libraries.") -set(BUILD_ADSK_USD_PLUGIN ON CACHE BOOL "Build Autodesk USD plugin.") -set(BUILD_PXR_USD_PLUGIN ON CACHE BOOL "Build the Pixar USD plugin and libraries.") -set(BUILD_AL_USD_PLUGIN ON CACHE BOOL "Build the Animal Logic USD plugin and libraries.") +set(BUILD_PXR_PLUGIN ON CACHE BOOL "Build the Pixar USD plugin and libraries.") +set(BUILD_AL_PLUGIN ON CACHE BOOL "Build the Animal Logic USD plugin and libraries.") #============================================================================== # Modules and Definitions @@ -28,11 +32,6 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/defaults ) -if (BUILD_MAYAUSD_CORE_LIBRARY) - include(cmake/mayausd_version.info) - set(MAYAUSD_VERSION "${MAYAUSD_MAJOR_VERSION}.${MAYAUSD_MINOR_VERSION}.${MAYAUSD_PATCH_LEVEL}") -endif() - if (APPLE) set(OSX_ARCHITECTURES "x86_64") add_definitions(-DOSMac_ -DMAC_PLUGIN) @@ -61,49 +60,30 @@ if(NOT WIN32) endif() string(REPLACE ";" " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") -#============================================================================== -# CORE -#============================================================================== -if (BUILD_MAYAUSD_CORE_LIBRARY) - - # set build location - set(MAYAUSD_BUILD_ROOT "${CMAKE_CURRENT_BINARY_DIR}/build-mayaUsd") - - # Including this file will end up calling ExternalProjet_Add which we use to - # perform the MayaUSD build. Note: That external project is executed immediately - # during the 'configure' phase of the AL_USDMaya cmake. This means that MayaUSD - # will perform the cmake config/build/install steps all at once. This is needed - # because AL_USDMaya needs to find an 'install' of MayaUSD. - include("core/MayaUsd.cmake") -endif() - #============================================================================== # PLUGINS #============================================================================== -if (BUILD_PXR_USD_PLUGIN) - add_subdirectory(plugins/PXR_USDMaya) +if (BUILD_PXR_PLUGIN) + add_subdirectory(plugin/pxr) endif() -if (BUILD_AL_USD_PLUGIN) - if(BUILD_USDMAYA_PXR_TRANSLATORS AND NOT BUILD_PXR_USD_PLUGIN) +if (BUILD_AL_PLUGIN) + if(BUILD_USDMAYA_PXR_TRANSLATORS AND NOT BUILD_PXR_PLUGIN) message(FATAL_ERROR "Animal logic's pixar translator depends on pixar plugin!") endif() - add_subdirectory(plugins/AL_USDMaya) + add_subdirectory(plugin/al) if(BUILD_USDMAYA_PXR_TRANSLATORS) add_dependencies(AL_USDMayaPxrTranslators usdMaya) endif() endif() -if (BUILD_ADSK_USD_PLUGIN) - add_subdirectory(plugins/ADSK_USDMaya) -endif() #============================================================================== -# Install Maya-USD.module +# Install mayaUSD.mod #============================================================================== -configure_file(Maya-USD.module.template ${PROJECT_BINARY_DIR}/Maya-USD.module) -install(FILES ${PROJECT_BINARY_DIR}/Maya-USD.module +configure_file(mayaUSD.mod.template ${PROJECT_BINARY_DIR}/mayaUSD.mod) +install(FILES ${PROJECT_BINARY_DIR}/mayaUSD.mod DESTINATION ${CMAKE_INSTALL_PREFIX} ) diff --git a/Maya-USD.module.template b/Maya-USD.module.template deleted file mode 100644 index d84f2660e5..0000000000 --- a/Maya-USD.module.template +++ /dev/null @@ -1,25 +0,0 @@ -+ USD -PYTHONPATH+:=lib/python -PATH+:=bin -PATH+:=lib - -+ PixarMayaUSD /USD -PYTHONPATH+:=lib/python -PATH+:=third_party/maya/lib -XBMLANGPATH+:=third_party/maya/lib/usd/usdMaya/resources -MAYA_SCRIPT_PATH+:=third_party/maya/lib/usd/usdMaya/resources -MAYA_PLUG_IN_PATH+:=third_party/maya/plugin - -+ MayaUSD /MayaUSD -PATH+:=lib -MAYA_PLUG_IN_PATH+:=plugin -PXR_PLUGINPATH_NAME+:=lib/usd -PYTHONPATH+:=python -MAYA_PLUG_IN_PATH+:=python -MAYA_WANT_UFE_SELECTION=1 - -+ AL_USDMaya /AL_USDMaya -PYTHONPATH+:=lib/python -PATH+:=lib -MAYA_PLUG_IN_PATH+:=plugin -PXR_PLUGINPATH_NAME+:=lib/usd \ No newline at end of file diff --git a/README.md b/README.md index a9476d03c3..033990ab85 100644 --- a/README.md +++ b/README.md @@ -2,15 +2,15 @@ USD for Maya is a project to create a Maya plugin, as well as reusable libraries, that provide translation and editing capabilities for Pixar Animation Studios Universal Scene Description (USD). -Read more about Pixars USD [here](http://openusd.org) +Read more about Pixar's USD [here](http://openusd.org) ## Motivation *Why yet another Maya plugin?* -As USD gains in popularity many studios have been wondering what plugin they should deploy within their pipelines. Two popular choices, used individually as well as together, have been the Pixar USDMaya plugin that has been part of USD itself, and Animal Logic's, which was separately released as Open Source. Both of these plugins have a strong community of users, but some have questioned when Autodesk would eventually release an officially supported plugin themselves. The goal of this project is to work directly with Pixar and Animal Logic, as well as other key contributors, in order to merge the best of both into a single supported plugin. +As USD gains in popularity many studios have been wondering what plugin they should deploy within their pipelines. Two popular choices, used individually as well as together, have been the Pixar USDMaya plugin that has been part of USD itself, and Animal Logic's, which was separately released as Open Source. Both plugins have a strong community of users, but some have questioned when Autodesk would eventually release an officially supported plugin themselves. The goal of this project is to work directly with Pixar and Animal Logic, as well as other key contributors, in order to merge the best of both into a single supported plugin. -Pixar maintains a list of contributors to USD in their documentation [here](https://graphics.pixar.com/usd/docs/USD-Contributors.html), and as we start working together to merge the two existing plugins it is also important to acknowlege the amount of work that individuals put in on the Animal Logic plugin as well. The list of those contributors is kept [here](docs/AL_CONTRIBUTORS.md). +Pixar maintains a list of contributors to USD in their documentation [here](https://graphics.pixar.com/usd/docs/USD-Contributors.html), and as we start working together to merge the two existing plugins it is also important to acknowledge the amount of work that individuals put in on the Animal Logic plugin as well. The list of those contributors is kept [here](doc/AL_CONTRIBUTORS.md). ## Getting Help Both Animal Logic and Pixar have their own Google interest groups which will remain great places to go with questions. @@ -21,6 +21,7 @@ Animal Lock forum is [here](https://groups.google.com/forum/#!forum/al_usdmaya-d ## Detailed Documentation -+ [Contributing](docs/CONTRIBUTING.md) -+ [Building](docs/build.md) -+ [Devloper](docs/DEVELOPER.md) ++ [Contributing](doc/CONTRIBUTING.md) ++ [Building](doc/build.md) ++ [License](doc/LICENSE.md) ++ [Developer](doc/DEVELOPER.md) diff --git a/build.py b/build.py index 21d3e3a05a..b16a6a6f7d 100644 --- a/build.py +++ b/build.py @@ -225,12 +225,11 @@ def CurrentWorkingDirectory(dir): def RunCMake(context, force, extraArgs=None): """Invoke CMake to configure, build, and install a library whose source code is located in the current working directory.""" - # Create a directory for out-of-source builds in the build directory - # using the name of the current working directory. + srcDir = os.getcwd() - instDir = (context.mayaUsdInstDir if srcDir == context.mayaUsdSrcDir - else srcDir == context.mayaUsdSrcDir) + instDir = context.instDir buildDir = os.path.join(context.buildDir, os.path.split(srcDir)[1]) + if force and os.path.isdir(buildDir): shutil.rmtree(buildDir) @@ -260,6 +259,10 @@ def RunCMake(context, force, extraArgs=None): variant= BuildVariant(context) with CurrentWorkingDirectory(buildDir): + # recreate build_log.txt everytime the script runs + if os.path.isfile(context.logFileLocation): + os.remove(context.logFileLocation) + Run('cmake ' '-DCMAKE_INSTALL_PREFIX="{instDir}" ' '-DCMAKE_BUILD_TYPE={variant} ' @@ -306,16 +309,20 @@ def InstallMayaUSD(context, force, buildArgs): parser = argparse.ArgumentParser( formatter_class=argparse.RawDescriptionHelpFormatter) -parser.add_argument("install_dir", type=str, - help="Directory where project will be installed") +parser.add_argument("workspace_location", type=str, + help="Directory where the project use as a workspace to build and install plugin/libraries.") parser.add_argument("--generator", type=str, help=("CMake generator to use when building libraries with " "cmake")) -parser.add_argument("--build_dir", type=str, - help=("Build directory for project" - "(default: /build_dir)")) +parser.add_argument("--build-location", type=str, + help=("Set Build directory" + "(default: /build-location)")) + +parser.add_argument("--install-location", type=str, + help=("Set Install directory" + "(default: /install-location)")) parser.add_argument("--maya-location", type=str, help="Directory where Maya is installed.") @@ -359,12 +366,16 @@ def __init__(self, args): self.mayaUsdSrcDir = os.path.normpath( os.path.join(os.path.abspath(os.path.dirname(__file__)))) - # Directory where plugins and libraries will be installed - self.mayaUsdInstDir = os.path.abspath(args.install_dir) + # Workspace directory + self.workspaceDir = os.path.abspath(args.workspace_location) + + # Build directory + self.buildDir = (os.path.abspath(args.build_location) if args.build_location + else os.path.join(self.workspaceDir, "build")) - # Directory where plugins and libraries will be built - self.buildDir = (os.path.abspath(args.build_dir) if args.build_dir - else os.path.join(self.mayaUsdInstDir, "build")) + # Install directory + self.instDir = (os.path.abspath(args.install_location) if args.install_location + else os.path.join(self.workspaceDir, "install")) # Build type self.buildDebug = args.build_debug @@ -396,6 +407,7 @@ def __init__(self, args): # Log File Name self.logFileName="build_log.txt" + self.logFileLocation=os.path.join(self.buildDir, os.path.basename(os.getcwd()),self.logFileName) # Build arguments self.buildArgs = list() @@ -413,11 +425,12 @@ def __init__(self, args): summaryMsg = """ Building with settings: Source directory {mayaUsdSrcDir} - Install directory {mayaUsdInstDir} + Workspace directory {workspaceDir} Build directory {buildDir} + Install directory {instDir} Variant {buildVariant} CMake generator {cmakeGenerator} - Build Log {logFileName}""" + Build Log {logFileLocation}""" if context.buildArgs: summaryMsg += """ @@ -425,9 +438,10 @@ def __init__(self, args): summaryMsg = summaryMsg.format( mayaUsdSrcDir=context.mayaUsdSrcDir, - mayaUsdInstDir=context.mayaUsdInstDir, + workspaceDir=context.workspaceDir, buildDir=context.buildDir, - logFileName=os.path.join(context.buildDir,context.logFileName), + instDir=context.instDir, + logFileLocation=context.logFileLocation, buildArgs=context.buildArgs, buildVariant=BuildVariant(context), cmakeGenerator=("Default" if not context.cmakeGenerator @@ -440,7 +454,7 @@ def __init__(self, args): InstallMayaUSD(context, context.forceBuild, context.buildArgs) # Ensure directory structure is created and is writable. -for dir in [context.mayaUsdInstDir, context.buildDir]: +for dir in [context.workspaceDir, context.buildDir]: try: if os.path.isdir(dir): testFile = os.path.join(dir, "canwrite") diff --git a/cmake/defaults/CXXDefaults.cmake b/cmake/defaults/CXXDefaults.cmake index 4b56546c4f..0b5c29a9a3 100644 --- a/cmake/defaults/CXXDefaults.cmake +++ b/cmake/defaults/CXXDefaults.cmake @@ -1,25 +1,17 @@ # # Copyright 2016 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # include(CXXHelpers) include(Version) diff --git a/cmake/defaults/CXXHelpers.cmake b/cmake/defaults/CXXHelpers.cmake index b5670659aa..8932ad229e 100644 --- a/cmake/defaults/CXXHelpers.cmake +++ b/cmake/defaults/CXXHelpers.cmake @@ -1,25 +1,17 @@ # # Copyright 2016 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # function(_add_define definition) list(APPEND _PXR_CXX_DEFINITIONS "-D${definition}") diff --git a/cmake/defaults/Options.cmake b/cmake/defaults/Options.cmake index 519813e062..294562e0c3 100644 --- a/cmake/defaults/Options.cmake +++ b/cmake/defaults/Options.cmake @@ -1,25 +1,17 @@ # # Copyright 2016 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # option(PXR_STRICT_BUILD_MODE "Turn on additional warnings. Enforce all warnings as errors." OFF) option(PXR_VALIDATE_GENERATED_CODE "Validate script generated code" OFF) diff --git a/cmake/defaults/Version.cmake b/cmake/defaults/Version.cmake index 899efd2794..d072997055 100644 --- a/cmake/defaults/Version.cmake +++ b/cmake/defaults/Version.cmake @@ -1,25 +1,17 @@ # # Copyright 2016 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # # Versioning information set(PXR_MAJOR_VERSION "0") diff --git a/cmake/defaults/clangdefaults.cmake b/cmake/defaults/clangdefaults.cmake index 0cba9b9927..55cf34f636 100644 --- a/cmake/defaults/clangdefaults.cmake +++ b/cmake/defaults/clangdefaults.cmake @@ -1,25 +1,17 @@ # # Copyright 2016 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # include(gccclangshareddefaults) diff --git a/cmake/defaults/gccclangshareddefaults.cmake b/cmake/defaults/gccclangshareddefaults.cmake index bf64fd4c53..5dac35534b 100644 --- a/cmake/defaults/gccclangshareddefaults.cmake +++ b/cmake/defaults/gccclangshareddefaults.cmake @@ -1,25 +1,17 @@ # # Copyright 2016 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # # This file contains a set of flags/settings shared between our diff --git a/cmake/defaults/gccdefaults.cmake b/cmake/defaults/gccdefaults.cmake index ce7789a2c5..b0313ba92a 100644 --- a/cmake/defaults/gccdefaults.cmake +++ b/cmake/defaults/gccdefaults.cmake @@ -1,25 +1,17 @@ # # Copyright 2016 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # include(gccclangshareddefaults) diff --git a/cmake/defaults/msvcdefaults.cmake b/cmake/defaults/msvcdefaults.cmake index 9024c5d3e8..996407b6f7 100644 --- a/cmake/defaults/msvcdefaults.cmake +++ b/cmake/defaults/msvcdefaults.cmake @@ -1,25 +1,17 @@ # # Copyright 2016 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # # Enable exception handling. diff --git a/cmake/mayausd_version.info b/cmake/mayausd_version.info deleted file mode 100644 index bb330b08ef..0000000000 --- a/cmake/mayausd_version.info +++ /dev/null @@ -1,3 +0,0 @@ -set(MAYAUSD_MAJOR_VERSION 0) -set(MAYAUSD_MINOR_VERSION 1) -set(MAYAUSD_PATCH_LEVEL 0) diff --git a/cmake/modules/FindMayaCoreUSD.cmake b/cmake/modules/FindMayaUSD.cmake similarity index 90% rename from cmake/modules/FindMayaCoreUSD.cmake rename to cmake/modules/FindMayaUSD.cmake index ee97759e42..cdbdff6fe5 100644 --- a/cmake/modules/FindMayaCoreUSD.cmake +++ b/cmake/modules/FindMayaUSD.cmake @@ -10,7 +10,7 @@ if(APPLE) find_path(MAYAUSD_LIBRARY_DIR - libmayaUsdCore.dylib + libmayaUsd.dylib HINTS "${MAYAUSD_LIB_ROOT}" "$ENV{MAYAUSD_LIB_ROOT}" @@ -26,7 +26,7 @@ if(APPLE) ) elseif(UNIX) find_path(MAYAUSD_LIBRARY_DIR - libmayaUsdCore.so + libmayaUsd.so HINTS "${MAYAUSD_LIB_ROOT}" "$ENV{MAYAUSD_LIB_ROOT}" @@ -42,7 +42,7 @@ elseif(UNIX) ) elseif(WIN32) find_path(MAYAUSD_LIBRARY_DIR - mayaUsdCore.lib + mayaUsd.lib HINTS "${MAYAUSD_LIB_ROOT}" "$ENV{MAYAUSD_LIB_ROOT}" @@ -59,7 +59,7 @@ elseif(WIN32) endif() find_path(MAYAUSD_INCLUDE_DIR - mayaUsd/MayaUsdApi.h + mayaUsd/mayaUsd.h HINTS "${MAYAUSD_INCLUDE_ROOT}" "$ENV{MAYAUSD_INCLUDE_ROOT}" @@ -74,12 +74,9 @@ find_path(MAYAUSD_INCLUDE_DIR "MayaUSD's headers path" ) -message(STATUS "MayaUSD Include directory: ${MAYAUSD_INCLUDE_DIR}") -message(STATUS "MayaUSD Library directory: ${MAYAUSD_LIBRARY_DIR}") - # Use find_library to account for platform-specific library name prefixes # (e.g. lib) and suffixes (e.g. .lib, .so, .dylib). -foreach(MAYAUSD_LIB mayaUsdCore) +foreach(MAYAUSD_LIB mayaUsd) find_library(MAYAUSD_LIBRARY NAMES @@ -97,7 +94,7 @@ endforeach(MAYAUSD_LIB) # If we weren't passed in the MayaUsd version info, read it from the header file. if (NOT DEFINED MAYAUSD_MAJOR_VERSION) - file(READ ${MAYAUSD_INCLUDE_DIR}/mayaUsd/MayaUsd.h MAYAUSD_MAIN_HEADER) + file(READ ${MAYAUSD_INCLUDE_DIR}/mayaUsd/mayaUsd.h MAYAUSD_MAIN_HEADER) string(REGEX REPLACE ".*\#define MAYAUSD_MAJOR_VERSION[ ]+([0-9]+).*" "\\1" MAYAUSD_MAJOR_VERSION ${MAYAUSD_MAIN_HEADER}) string(REGEX REPLACE ".*\#define MAYAUSD_MINOR_VERSION[ ]+([0-9]+).*" "\\1" MAYAUSD_MINOR_VERSION ${MAYAUSD_MAIN_HEADER}) string(REGEX REPLACE ".*\#define MAYAUSD_PATCH_LEVEL[ ]+([0-9]+).*" "\\1" MAYAUSD_PATCH_LEVEL ${MAYAUSD_MAIN_HEADER}) diff --git a/cmake/usd.cmake b/cmake/usd.cmake index c968c47528..2a2494e17a 100644 --- a/cmake/usd.cmake +++ b/cmake/usd.cmake @@ -1,14 +1,21 @@ -#- -#***************************************************************************** +# +# ======================================================================= # Copyright 2019 Autodesk, Inc. All rights reserved. # -# These coded instructions, statements, and computer programs contain -# unpublished proprietary information written by Autodesk, Inc. and are -# protected by Federal copyright law. They may not be disclosed to third -# parties or copied or duplicated in any form, in whole or in part, without -# the prior written consent of Autodesk, Inc. -#***************************************************************************** -#+ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ======================================================================= +# + function(init_usd) set(PXR_USD_LOCATION "${PXR_USD_LOCATION}" PARENT_SCOPE) diff --git a/cmake/utils.cmake b/cmake/utils.cmake index 8ae4fc397e..9e7f506e77 100644 --- a/cmake/utils.cmake +++ b/cmake/utils.cmake @@ -1,14 +1,20 @@ -#- +# # ======================================================================= -# Copyright 2018 Autodesk, Inc. All rights reserved. +# Copyright 2019 Autodesk, Inc. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # -# This computer source code and related instructions and comments are the -# unpublished confidential and proprietary information of Autodesk, Inc. -# and are protected under applicable copyright and trade secret law. They -# may not be disclosed to, copied or used by any third party without the -# prior written consent of Autodesk, Inc. +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # ======================================================================= -#+ +# # Appends a path to an environment variable. # Note: if you want to append multiple paths either call this multiple diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt deleted file mode 100644 index 106522b68e..0000000000 --- a/core/CMakeLists.txt +++ /dev/null @@ -1,42 +0,0 @@ -#- -#***************************************************************************** -# Copyright 2019 Autodesk, Inc. All rights reserved. -# -# These coded instructions, statements, and computer programs contain -# unpublished proprietary information written by Autodesk, Inc. and are -# protected by Federal copyright law. They may not be disclosed to third -# parties or copied or duplicated in any form, in whole or in part, without -# the prior written consent of Autodesk, Inc. -#***************************************************************************** -#+ - -cmake_minimum_required(VERSION 3.1.1) -project(mayaUsd) - -if (POLICY CMP0074) - cmake_policy(SET CMP0074 OLD) -endif() - -#============================================================================== -# Modules and Definitions -#============================================================================== -list(APPEND CMAKE_MODULE_PATH - ${PROJECT_SOURCE_DIR}/../cmake/defaults - ${PROJECT_SOURCE_DIR}/../cmake/modules -) - -if (WIN32) - set(CMAKE_INCLUDE_CURRENT_DIR ON) -endif() - -if (APPLE) - set(CMAKE_MACOSX_RPATH ON) -endif() - -#============================================================================== -# Packages -#============================================================================== -find_package(Maya REQUIRED) - -add_subdirectory(include) -add_subdirectory(src) \ No newline at end of file diff --git a/core/CMakeLists_MayaUsd.txt.in b/core/CMakeLists_MayaUsd.txt.in deleted file mode 100644 index a824f3d42f..0000000000 --- a/core/CMakeLists_MayaUsd.txt.in +++ /dev/null @@ -1,29 +0,0 @@ -cmake_minimum_required(VERSION 2.8.12) - -project(mayaUsd NONE) - -# Not specifying CONFIGURE_COMMAND, BUILD_COMMAND, or INSTALL_COMMAND means use -# CMake. Specifying a XXX_COMMAND as empty string means omit the step. - -include(ExternalProject) - -message(STATUS "MayaUSD install dir = ${MAYAUSD_INSTALL_DIR}") - -ExternalProject_Add(mayaUsd - PREFIX "${MAYAUSD_BUILD_ROOT}" - STAMP_DIR "${MAYAUSD_BUILD_ROOT}/mayausd-stamp" - TMP_DIR "${MAYAUSD_BUILD_ROOT}/mayausd-temp" - SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/core" - BINARY_DIR "${MAYAUSD_BUILD_ROOT}/mayausd-build" - INSTALL_DIR "${MAYAUSD_INSTALL_DIR}" - DOWNLOAD_COMMAND "" - UPDATE_COMMAND "" - ${MAYAUSD_BUILD_ALWAYS} - CMAKE_ARGS - "-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}" - "-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}" - "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}" - "-DCMAKE_INSTALL_PREFIX=${MAYAUSD_INSTALL_DIR}" - "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}" - "${MAYAUSD_DEFINES}" -) diff --git a/core/MayaUsd.cmake b/core/MayaUsd.cmake deleted file mode 100644 index d9f03ddca4..0000000000 --- a/core/MayaUsd.cmake +++ /dev/null @@ -1,74 +0,0 @@ -message("MayaUsd.cmake") - -# Convert some vars to forward slashes (if required) to fix invalid escape -# sequence parsing errors. -file(TO_CMAKE_PATH ${CMAKE_MAKE_PROGRAM} CMAKE_MAKE_PROGRAM) -file(TO_CMAKE_PATH ${MAYA_LOCATION} MAYA_LOCATION) -file(TO_CMAKE_PATH ${MAYAUSD_BUILD_ROOT} MAYAUSD_BUILD_ROOT) - -message("CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}") -message("CMAKE_MAKE_PROGRAM = ${CMAKE_MAKE_PROGRAM}") -message("MAYA_LOCATION = ${MAYA_LOCATION}") -message("MAYAUSD_BUILD_ROOT = ${MAYAUSD_BUILD_ROOT}") -message("PXR_USD_LOCATION = ${PXR_USD_LOCATION}") -message("USD_CONFIG_FILE = ${USD_CONFIG_FILE}") - -# Helper macro to add the needed defines to a list so that we can easily pass -# them to the external project. That external project is executed in a separate -# cmake process meaning it doesn't automatically inherit all these variables. -macro(add_mayausd_define var) - if (DEFINED ${var}) - list(APPEND MAYAUSD_DEFINES -D${var}=${${var}}) - endif() -endmacro(add_mayausd_define) - -# -add_mayausd_define(MAYA_LOCATION) - -set(MAYAUSD_INSTALL_DIR "${MAYAUSD_BUILD_ROOT}/mayausd-install/mayaUsd-${MAYAUSD_MAJOR_VERSION}-${MAYAUSD_MINOR_VERSION}-${MAYAUSD_PATCH_LEVEL}") - -# Configure the file that contains our external project command. -if (NOT CMAKE_VERSION VERSION_LESS "3.1.3") - set(MAYAUSD_BUILD_ALWAYS "BUILD_ALWAYS ON") -endif() -configure_file(core/CMakeLists_MayaUsd.txt.in ${MAYAUSD_BUILD_ROOT}/mayausd-config/CMakeLists.txt) - -# Execute the MayaUSD build right now. -message(STATUS "========== Building MayaUSD_v${MAYAUSD_VERSION} ... ==========") -execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" "-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}" . - RESULT_VARIABLE result - WORKING_DIRECTORY ${MAYAUSD_BUILD_ROOT}/mayausd-config ) -if(result) - message(FATAL_ERROR "CMake step for MayaUSD failed: ${result}") -endif() - -# If we are passed in extra build flags, we add them here. -# Note: need to figure out how to pass this variable which contains the string: -# /nr:false /m /p:Configuration=RelWithDebInfo;Architecture=x64 -# The problem is the "/ : ;" are being interpreted and causing problems. -# How to pass this var just as a plain string? -# execute_process(COMMAND ${CMAKE_COMMAND} --build . -- ${MAYAUSD_CMAKE_BUILD_FLAGS} -# -execute_process(COMMAND ${CMAKE_COMMAND} --build . --config ${CMAKE_BUILD_TYPE} - RESULT_VARIABLE result - WORKING_DIRECTORY ${MAYAUSD_BUILD_ROOT}/mayausd-config ) -if(result) - message(FATAL_ERROR "Build step for MayaUSD failed: ${result}") -endif() -message(STATUS "========== ... MayaUSD installed. ==========") - - -set(MAYAUSD_INCLUDE_ROOT ${MAYAUSD_INSTALL_DIR}) -set(MAYAUSD_LIB_ROOT ${MAYAUSD_INSTALL_DIR}) - -set(INSTALL_DIR_SUFFIX MayaUSD) - -# Install the entire MayaUsd folder into the same folder as ${CMAKE_INSTALL_PREFIX}. -# Note: the trailing slash is intentional so we won't end up with a 'mayaUsd' sub-folder. -# we also exlude the *.lib files. -install( - DIRECTORY ${MAYAUSD_INSTALL_DIR}/ - DESTINATION ${CMAKE_INSTALL_PREFIX}/${INSTALL_DIR_SUFFIX} - PATTERN *.lib EXCLUDE - PATTERN include EXCLUDE -) diff --git a/core/README.md b/core/README.md deleted file mode 100644 index 2859cc8769..0000000000 --- a/core/README.md +++ /dev/null @@ -1 +0,0 @@ -# Core library diff --git a/core/include/CMakeLists.txt b/core/include/CMakeLists.txt deleted file mode 100644 index ede0111342..0000000000 --- a/core/include/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -# Perform variable substitution on input file to create destination file with -# MayaUsd versioned namespace. -configure_file(MayaUsd.h.src ${CMAKE_CURRENT_BINARY_DIR}/MayaUsd.h) diff --git a/core/include/MayaUsd.h.src b/core/include/MayaUsd.h.src deleted file mode 100644 index ae568132c2..0000000000 --- a/core/include/MayaUsd.h.src +++ /dev/null @@ -1,38 +0,0 @@ -#pragma once - -// =========================================================================== -// Copyright 2019 Autodesk, Inc. All rights reserved. -// -// Use of this software is subject to the terms of the Autodesk license -// agreement provided at the time of installation or download, or which -// otherwise accompanies this software in either electronic or hard copy form. -// =========================================================================== - -#define MAYAUSD_MAJOR_VERSION ${MAYAUSD_MAJOR_VERSION} -#define MAYAUSD_MINOR_VERSION ${MAYAUSD_MINOR_VERSION} -#define MAYAUSD_PATCH_LEVEL ${MAYAUSD_PATCH_LEVEL} - -// MayaUsd public namespace string will never change. -#define MAYAUSD_NS MayaUsd -// C preprocessor trickery to expand arguments. -#define MAYAUSD_CONCAT(A, B) MAYAUSD_CONCAT_IMPL(A, B) -#define MAYAUSD_CONCAT_IMPL(A, B) A##B -// Versioned namespace includes the major version number. -#define MAYAUSD_VERSIONED_NS MAYAUSD_CONCAT(MAYAUSD_NS, _v${MAYAUSD_MAJOR_VERSION}) - -namespace MAYAUSD_VERSIONED_NS {} - -// With a using namespace declaration, pull in the versioned namespace into the -// MayaUsd public namespace, to allow client code to use the plain MayaUsd -// namespace, e.g. MayaUsd::Class. -namespace MAYAUSD_NS { - using namespace MAYAUSD_VERSIONED_NS; -} - -// Macros to place the MayaUsd symbols in the versioned namespace, which is how -// they will appear in the shared library, e.g. MayaUsd_v1::Class. -#ifdef DOXYGEN -#define MAYAUSD_NS_DEF namespace MAYAUSD_NS -#else -#define MAYAUSD_NS_DEF namespace MAYAUSD_VERSIONED_NS -#endif diff --git a/core/include/MayaUsdApi.h b/core/include/MayaUsdApi.h deleted file mode 100644 index e5097e5993..0000000000 --- a/core/include/MayaUsdApi.h +++ /dev/null @@ -1,84 +0,0 @@ -// =========================================================================== -// Copyright 2019 Autodesk, Inc. All rights reserved. -// -// Use of this software is subject to the terms of the Autodesk license -// agreement provided at the time of installation or download, or which -// otherwise accompanies this software in either electronic or hard copy form. -// =========================================================================== - -#if defined _WIN32 || defined __CYGWIN__ - - // The main export symbol used for the core library. - #ifdef MAYAUSD_CORE_EXPORT - #ifdef __GNUC__ - #define MAYAUSD_CORE_PUBLIC __attribute__ ((dllexport)) - #else - #define MAYAUSD_CORE_PUBLIC __declspec(dllexport) - #endif - #else - #ifdef __GNUC__ - #define MAYAUSD_CORE_PUBLIC __attribute__ ((dllimport)) - #else - #define MAYAUSD_CORE_PUBLIC __declspec(dllimport) - #endif - #endif - #define MAYAUSD_CORE_LOCAL - - // We have a separate export symbol used in the helper macros. - #ifdef MAYAUSD_MACROS_EXPORT - #ifdef __GNUC__ - #define MAYAUSD_MACROS_PUBLIC __attribute__ ((dllexport)) - #else - #define MAYAUSD_MACROS_PUBLIC __declspec(dllexport) - #endif - #else - #ifdef __GNUC__ - #define MAYAUSD_MACROS_PUBLIC __attribute__ ((dllimport)) - #else - #define MAYAUSD_MACROS_PUBLIC __declspec(dllimport) - #endif - #endif - #define MAYAUSD_MACROS_LOCAL - - // We need a different export symbol for the plugin because when we are building - // the actual Maya plugin we must 'export' the two functions for plugin load/unload. - // And then we won't set the core export because we need to 'import' the symbols. - #ifdef MAYAUSD_PLUGIN_EXPORT - #ifdef __GNUC__ - #define MAYAUSD_PLUGIN_PUBLIC __attribute__ ((dllexport)) - #else - #define MAYAUSD_PLUGIN_PUBLIC __declspec(dllexport) - #endif - #else - #ifdef __GNUC__ - #define MAYAUSD_PLUGIN_PUBLIC __attribute__ ((dllimport)) - #else - #define MAYAUSD_PLUGIN_PUBLIC __declspec(dllimport) - #endif - #endif - #define MAYAUSD_PLUGIN_LOCAL -#else - #if __GNUC__ >= 4 - #define MAYAUSD_CORE_PUBLIC __attribute__ ((visibility ("default"))) - #define MAYAUSD_CORE_LOCAL __attribute__ ((visibility ("hidden"))) - - #define MAYAUSD_MACROS_PUBLIC __attribute__ ((visibility ("default"))) - #define MAYAUSD_MACROS_LOCAL __attribute__ ((visibility ("hidden"))) - - #define MAYAUSD_PLUGIN_PUBLIC __attribute__ ((visibility ("default"))) - #define MAYAUSD_PLUGIN_LOCAL __attribute__ ((visibility ("hidden"))) -#else - #define MAYAUSD_CORE_PUBLIC - #define MAYAUSD_CORE_LOCAL - - #define MAYAUSD_MACROS_PUBLIC - #define MAYAUSD_MACROS_LOCAL - - #define MAYAUSD_PLUGIN_PUBLIC - #define MAYAUSD_PLUGIN_LOCAL -#endif -#endif - -// Convenience symbol versioning include: because MayaUsdApi.h is widely -// included, this reduces the need to explicitly include MayaUsd.h. -#include "MayaUsd.h" diff --git a/core/src/CMakeLists.txt b/core/src/CMakeLists.txt deleted file mode 100644 index 4f40361dac..0000000000 --- a/core/src/CMakeLists.txt +++ /dev/null @@ -1,62 +0,0 @@ -set(LIBRARY_NAME mayaUsdCore) - -list(APPEND mayaUsdCore_src - core.cpp -) - -list(APPEND mayaUsdCore_headers - ../include/MayaUsdApi.h -) - -add_library(${LIBRARY_NAME} - SHARED - ${mayaUsdCore_src} -) - -target_compile_definitions(${LIBRARY_NAME} - PRIVATE - MAYAUSD_MACROS_EXPORT - MAYAUSD_CORE_EXPORT - MFB_PACKAGE_NAME="${LIBRARY_NAME}" - MFB_ALT_PACKAGE_NAME="${LIBRARY_NAME}" - MFB_PACKAGE_MODULE=mayaUsdCore -) - -target_include_directories( - ${LIBRARY_NAME} - PUBLIC - ${MAYA_INCLUDE_DIRS} - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/../include - # MayaUsd.h is generated in the build area - ${CMAKE_CURRENT_BINARY_DIR}/../include -) - -target_link_libraries(${LIBRARY_NAME} - ${MAYA_Foundation_LIBRARY} - ${MAYA_OpenMayaAnim_LIBRARY} - ${MAYA_OpenMaya_LIBRARY} -) - -install(TARGETS ${LIBRARY_NAME} - LIBRARY - DESTINATION ${CMAKE_INSTALL_PREFIX}/lib - ARCHIVE - DESTINATION ${CMAKE_INSTALL_PREFIX}/lib - RUNTIME - DESTINATION ${CMAKE_INSTALL_PREFIX}/lib -) -if(MSVC) - install(FILES $ DESTINATION ${CMAKE_INSTALL_PREFIX}/lib OPTIONAL) -endif() - -set_property(GLOBAL PROPERTY GLOBAL_LIBRARY_LOCATION ${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}${LIBRARY_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}) - -# install public headers -install(FILES ${mayaUsdCore_headers} - DESTINATION ${CMAKE_INSTALL_PREFIX}/include/mayaUsd -) - -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/../include/MayaUsd.h - DESTINATION ${CMAKE_INSTALL_PREFIX}/include/mayaUsd -) diff --git a/core/src/core.cpp b/core/src/core.cpp deleted file mode 100644 index 5a86c04bf8..0000000000 --- a/core/src/core.cpp +++ /dev/null @@ -1,5 +0,0 @@ -#include "MayaUsdApi.h" - -class MAYAUSD_CORE_PUBLIC Dummy -{ -}; \ No newline at end of file diff --git a/docs/AL_CONTRIBUTORS.md b/doc/AL_CONTRIBUTORS.md similarity index 100% rename from docs/AL_CONTRIBUTORS.md rename to doc/AL_CONTRIBUTORS.md diff --git a/docs/AutodeskFormCorpContribAgmtForOpenSource.docx b/doc/AutodeskFormCorpContribAgmtForOpenSource.docx similarity index 100% rename from docs/AutodeskFormCorpContribAgmtForOpenSource.docx rename to doc/AutodeskFormCorpContribAgmtForOpenSource.docx diff --git a/docs/AutodeskFormIndContribAgmtForOpenSource.docx b/doc/AutodeskFormIndContribAgmtForOpenSource.docx similarity index 100% rename from docs/AutodeskFormIndContribAgmtForOpenSource.docx rename to doc/AutodeskFormIndContribAgmtForOpenSource.docx diff --git a/docs/CONTRIBUTING.md b/doc/CONTRIBUTING.md similarity index 100% rename from docs/CONTRIBUTING.md rename to doc/CONTRIBUTING.md diff --git a/doc/DEVELOPER.md b/doc/DEVELOPER.md new file mode 100644 index 0000000000..0e5a94bbb9 --- /dev/null +++ b/doc/DEVELOPER.md @@ -0,0 +1,7 @@ +## Repository Layout + +| Location | Description | +| ------------- | --------------- | +| lib | The libraries that all other plugins depend on. Will contain common utilities and features. | +| plugin/pxr | The Pixar Maya plugin | +| plugin/al | The Animal Logic Maya plugin | \ No newline at end of file diff --git a/docs/LICENSE.md b/doc/LICENSE.md similarity index 100% rename from docs/LICENSE.md rename to doc/LICENSE.md diff --git a/docs/build.md b/doc/build.md similarity index 66% rename from docs/build.md rename to doc/build.md index 77f596d1e7..b293520275 100644 --- a/docs/build.md +++ b/doc/build.md @@ -2,9 +2,9 @@ ## Getting and Building the Code -The simplest way to build the plugins is to run the supplied ```build.py``` script. This script will build and install the libraries and plugins into three separate directories (USD, AL_USDMaya, MayaUSD). +The simplest way to build the plugins is to run the supplied ```build.py``` script. This script will build and install the libraries and plugins into separate directories (e.g plugin/al, plugin/pxr). -Follow the instructions below to run the script with its default behavior, which will build the USD Core libraries, ADSK_USDMaya, AL_USDMaya, PXR_USDMaya plugins/libraries. For more options and documentation, run the script with the ```--help``` parameter. +Follow the instructions below to run the script with its default behavior, which will build Animal Logic and Pixar plugins/libraries. For more options and documentation, run the script with the ```--help``` parameter. #### 1. Install prerequisites @@ -32,19 +32,19 @@ There are four arguments that must be passed to the script: - --maya-location ---> Directory where Maya is installed. - --pxrusd-location ---> Directory where Pixar USD Core is installed. - --devkit-location ---> Directory where Maya Devkit is installed. -- install_dir ---> Directory where project will be installed +- workspace_location ---> Directory where the project use as a workspace to build and install plugin/libraries. -When builidng Pixar USD Core, you need to pass ```--no-maya``` to ensure that ```third_party/maya``` plugin doesn't get built. +When building Pixar USD Core, you need to pass ```--no-maya``` to ensure that ```third_party/maya``` plugin doesn't get built. Custom arguments can be also passed to build system using ```--build-args```. e.g ``` -python build.py --build-args="-DBUILD_ADSK_USD_PLUGIN=ON,-DBUILD_PXR_USD_PLUGIN=OFF" +python build.py --build-args="-DBUILD_ADSK_PLUGIN=ON,-DBUILD_PXR_PLUGIN=OFF" ``` #### 4. CMake Generator -It is up to the user to select the Cmake Generator of choice but we encourage the use of Ninja genrator. +It is up to the user to select the CMake Generator of choice but, we encourage the use of the Ninja generator. To use the Ninja Generator, you need to first install the Ninja binary from https://ninja-build.org/ @@ -54,7 +54,7 @@ python build.py --generator Ninja --build-args=-DCMAKE_MAKE_PROGRAM='path to nin ``` #### 5. Build location -By default the build directory is created in the install_dir but you can change the location to where ever you want by setting the ```--build_dir``` flag. +By default, the build directory is created inside the workspace directory but you can change the location to where ever you want by setting the ```--build-location``` flag. #### 6. Build Log @@ -62,33 +62,38 @@ Build log is written into ```build_log.txt``` inside the build directory. #### 7. Run the script -For example, the following will build and install ADSK_USDMaya, AL_USDMaya,PXR_USDMaya plugins/libraries into install_dir. +For example, the following will build and install Animal Logic and Pixar plugins/libraries into the workspace directory. ##### Linux: ``` -➜ python build.py --maya-location /usr/autodesk/maya2019 --pxrusd-location /usr/local/USD-Master /usr/local/BUILD-USD +➜ python build.py --maya-location /usr/autodesk/maya2019 --pxrusd-location /usr/local/USD-Master /usr/local/workspace ``` ##### MacOS: ``` -➜ python build.py --maya-location /Applications/Autodesk/maya2019 --pxrusd-location /opt/local/USD-Master /opt/local/BUILD-USD +➜ python build.py --maya-location /Applications/Autodesk/maya2019 --pxrusd-location /opt/local/USD-Master /opt/local/workspace ``` ##### Windows: ``` -C:\> python build.py --maya-location "C:\Program Files\Autodesk\maya2019" --pxrusd-location C:\USD-Master C:\BUILD-USD +C:\> python build.py --maya-location "C:\Program Files\Autodesk\maya2019" --pxrusd-location C:\USD-Master C:\workspace ``` ## CMake Options Name | Description | Default --- | --- | --- -BUILD_MAYAUSD_CORE_LIBRARY | Builds the Autodesk Maya Core USD libraries. | ON -BUILD_ADSK_USD_PLUGIN | Builds the Autodesk Maya USD plugin. | ON -BUILD_AL_USD_PLUGIN | Builds the Animal Logic USD plugin and libraries. | ON -BUILD_PXR_USD_PLUGIN | Builds the Pixar USD plugin and libraries. | ON +BUILD_AL_PLUGIN | Builds the Animal Logic USD plugin and libraries. | ON +BUILD_PXR_PLUGIN | Builds the Pixar USD plugin and libraries. | ON # Building USD -##### MacOS: +##### Boost: + +Currently Animal Logic plugin has a dependency on some of the boost components ( e.g thread, filesystem ). When building Pixar USD, one needs to pass following key,value paired arguments for boost to include those components: +e.g + +```python build_usd.py --build-args boost,"--with-date_time --with-thread --with-system --with-filesystem" --no-maya ~/Desktop/BUILD``` + +##### Python: Some DCCs (most notably, Maya) may ship with and run using their own version of Python. In that case, it is important that USD and the plugins for that DCC are built using the DCC's version of Python and not the system version. Note that this is primarily an issue on macOS, where a DCC's version of Python is likely to conflict with the version provided by the system. @@ -96,7 +101,7 @@ To build USD and the Maya plugins on macOS for Maya 2019, run: ``` /Applications/Autodesk/maya2019/Maya.app/Contents/bin/mayapy build_usd.py --no-maya ~/Desktop/BUILD ``` -By default ``usdview`` is built which has a dependency on PyOpenGL. Since Python version of Maya doesn't ship with PyOpenGL you will be prompted with following error message: +By default, ``usdview`` is built which has a dependency on PyOpenGL. Since Python version of Maya doesn't ship with PyOpenGL you will be prompted with following error message: ``` PyOpenGL is not installed. If you have pip installed, run "pip install PyOpenGL" to install it, then re-run this script. If PyOpenGL is already installed, you may need to update your PYTHONPATH to indicate where it is located. diff --git a/docs/DEVELOPER.md b/docs/DEVELOPER.md deleted file mode 100644 index 5c41368143..0000000000 --- a/docs/DEVELOPER.md +++ /dev/null @@ -1,8 +0,0 @@ -## Repository Layout - -| Location | Description | -| ------------- | --------------- | -| core | The core library that all other plugins depend on. Will contain common utilities and features. | -| plugins/PXR_USDMaya | The Pixar Maya plugin | -| plugins/AL_USDMaya | The Animal Logic Maya plugin | -| plugins/ADSK_USDMaya | The new Autodesk plugin | diff --git a/lib/README.md b/lib/README.md new file mode 100644 index 0000000000..e6ba02a37b --- /dev/null +++ b/lib/README.md @@ -0,0 +1,3 @@ +## NOTE + +This folder holds the libraries that all other plugins depend on. It will contain library of building blocks. diff --git a/mayaUSD.mod.template b/mayaUSD.mod.template new file mode 100644 index 0000000000..186c7ece85 --- /dev/null +++ b/mayaUSD.mod.template @@ -0,0 +1,18 @@ ++ USD +PYTHONPATH+:=lib/python +PATH+:=bin +PATH+:=lib + ++ PXR_USDMAYA +PYTHONPATH+:=lib/python +PATH+:=maya/lib +XBMLANGPATH+:=maya/lib/usd/usdMaya/resources +MAYA_SCRIPT_PATH+:=maya/lib/usd/usdMaya/resources +MAYA_PLUG_IN_PATH+:=maya/plugin +PXR_PLUGINPATH_NAME+:=lib/usd + ++ AL_USDMaya +PYTHONPATH+:=lib/python +PATH+:=lib +MAYA_PLUG_IN_PATH+:=plugin +PXR_PLUGINPATH_NAME+:=lib/usd \ No newline at end of file diff --git a/plugins/AL_USDMaya/ALUsdMayaConfig.cmake.in b/plugin/al/ALUsdMayaConfig.cmake.in similarity index 100% rename from plugins/AL_USDMaya/ALUsdMayaConfig.cmake.in rename to plugin/al/ALUsdMayaConfig.cmake.in diff --git a/plugins/AL_USDMaya/CMakeLists.txt b/plugin/al/CMakeLists.txt similarity index 97% rename from plugins/AL_USDMaya/CMakeLists.txt rename to plugin/al/CMakeLists.txt index a808d8a920..b8cde9bf6a 100644 --- a/plugins/AL_USDMaya/CMakeLists.txt +++ b/plugin/al/CMakeLists.txt @@ -11,7 +11,7 @@ set(NEED_BOOST_FILESYSTEM ON) set(CMAKE_VERBOSE_MAKEFILE OFF) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(BOOST_ROOT ${PXR_USD_LOCATION}) -set(INSTALL_DIR_SUFFIX AL_USDMaya) +set(INSTALL_DIR_SUFFIX plugin/al) option(BUILD_USDMAYA_SCHEMAS "Build optional schemas." ON) option(BUILD_USDMAYA_TRANSLATORS "Build optional translators." ON) @@ -34,7 +34,7 @@ find_package(Maya REQUIRED) # to get PYTHON_EXECUTABLE find_package(PythonInterp) -# find_package(MayaCoreUSD REQUIRED) +# find_package(MayaUSD REQUIRED) if(CMAKE_WANT_UFE_BUILD) add_definitions(-DWANT_UFE_BUILD) @@ -179,7 +179,7 @@ if(BUILD_USDMAYA_SCHEMAS) add_subdirectory(schemas) if(BUILD_USDMAYA_TRANSLATORS) message(STATUS "Building AL_USDMayaTranslators") - set(USD_MAYA_INCLUDE_DIR ${CMAKE_BINARY_DIR}/third_party/maya/include) + set(USD_MAYA_INCLUDE_DIR ${CMAKE_BINARY_DIR}/maya/include) set(TRANSLATORS_PACKAGE AL_USDMayaTranslators) add_subdirectory(translators) endif() diff --git a/plugins/AL_USDMaya/CMakeLists_googletest_download.txt.in b/plugin/al/CMakeLists_googletest_download.txt.in similarity index 100% rename from plugins/AL_USDMaya/CMakeLists_googletest_download.txt.in rename to plugin/al/CMakeLists_googletest_download.txt.in diff --git a/plugins/AL_USDMaya/CMakeLists_googletest_src.txt.in b/plugin/al/CMakeLists_googletest_src.txt.in similarity index 100% rename from plugins/AL_USDMaya/CMakeLists_googletest_src.txt.in rename to plugin/al/CMakeLists_googletest_src.txt.in diff --git a/plugins/AL_USDMaya/LICENSE.txt b/plugin/al/LICENSE.txt similarity index 100% rename from plugins/AL_USDMaya/LICENSE.txt rename to plugin/al/LICENSE.txt diff --git a/plugins/AL_USDMaya/README.md b/plugin/al/README.md similarity index 100% rename from plugins/AL_USDMaya/README.md rename to plugin/al/README.md diff --git a/plugins/AL_USDMaya/docs/animation.md b/plugin/al/docs/animation.md similarity index 100% rename from plugins/AL_USDMaya/docs/animation.md rename to plugin/al/docs/animation.md diff --git a/plugins/AL_USDMaya/docs/assetresolution.md b/plugin/al/docs/assetresolution.md similarity index 100% rename from plugins/AL_USDMaya/docs/assetresolution.md rename to plugin/al/docs/assetresolution.md diff --git a/plugins/AL_USDMaya/docs/basicUsage.md b/plugin/al/docs/basicUsage.md similarity index 100% rename from plugins/AL_USDMaya/docs/basicUsage.md rename to plugin/al/docs/basicUsage.md diff --git a/plugins/AL_USDMaya/docs/build.md b/plugin/al/docs/build.md similarity index 100% rename from plugins/AL_USDMaya/docs/build.md rename to plugin/al/docs/build.md diff --git a/plugins/AL_USDMaya/docs/contributing.md b/plugin/al/docs/contributing.md similarity index 100% rename from plugins/AL_USDMaya/docs/contributing.md rename to plugin/al/docs/contributing.md diff --git a/plugins/AL_USDMaya/docs/developer.md b/plugin/al/docs/developer.md similarity index 100% rename from plugins/AL_USDMaya/docs/developer.md rename to plugin/al/docs/developer.md diff --git a/plugins/AL_USDMaya/docs/events.md b/plugin/al/docs/events.md similarity index 100% rename from plugins/AL_USDMaya/docs/events.md rename to plugin/al/docs/events.md diff --git a/plugins/AL_USDMaya/docs/extraDataTranslatorPlugins.md b/plugin/al/docs/extraDataTranslatorPlugins.md similarity index 100% rename from plugins/AL_USDMaya/docs/extraDataTranslatorPlugins.md rename to plugin/al/docs/extraDataTranslatorPlugins.md diff --git a/plugins/AL_USDMaya/docs/faq.md b/plugin/al/docs/faq.md similarity index 100% rename from plugins/AL_USDMaya/docs/faq.md rename to plugin/al/docs/faq.md diff --git a/plugins/AL_USDMaya/docs/geometry.md b/plugin/al/docs/geometry.md similarity index 100% rename from plugins/AL_USDMaya/docs/geometry.md rename to plugin/al/docs/geometry.md diff --git a/plugins/AL_USDMaya/docs/importExport.md b/plugin/al/docs/importExport.md similarity index 100% rename from plugins/AL_USDMaya/docs/importExport.md rename to plugin/al/docs/importExport.md diff --git a/plugins/AL_USDMaya/docs/layers.md b/plugin/al/docs/layers.md similarity index 100% rename from plugins/AL_USDMaya/docs/layers.md rename to plugin/al/docs/layers.md diff --git a/plugins/AL_USDMaya/docs/lock.md b/plugin/al/docs/lock.md similarity index 100% rename from plugins/AL_USDMaya/docs/lock.md rename to plugin/al/docs/lock.md diff --git a/plugins/AL_USDMaya/docs/proxyShape.md b/plugin/al/docs/proxyShape.md similarity index 100% rename from plugins/AL_USDMaya/docs/proxyShape.md rename to plugin/al/docs/proxyShape.md diff --git a/plugins/AL_USDMaya/docs/pxrcomparison.md b/plugin/al/docs/pxrcomparison.md similarity index 100% rename from plugins/AL_USDMaya/docs/pxrcomparison.md rename to plugin/al/docs/pxrcomparison.md diff --git a/plugins/AL_USDMaya/docs/python.md b/plugin/al/docs/python.md similarity index 100% rename from plugins/AL_USDMaya/docs/python.md rename to plugin/al/docs/python.md diff --git a/plugins/AL_USDMaya/docs/schemaTranslatorPlugins.md b/plugin/al/docs/schemaTranslatorPlugins.md similarity index 100% rename from plugins/AL_USDMaya/docs/schemaTranslatorPlugins.md rename to plugin/al/docs/schemaTranslatorPlugins.md diff --git a/plugins/AL_USDMaya/docs/selection.md b/plugin/al/docs/selection.md similarity index 100% rename from plugins/AL_USDMaya/docs/selection.md rename to plugin/al/docs/selection.md diff --git a/plugins/AL_USDMaya/docs/testing.md b/plugin/al/docs/testing.md similarity index 100% rename from plugins/AL_USDMaya/docs/testing.md rename to plugin/al/docs/testing.md diff --git a/plugins/AL_USDMaya/docs/translation.md b/plugin/al/docs/translation.md similarity index 100% rename from plugins/AL_USDMaya/docs/translation.md rename to plugin/al/docs/translation.md diff --git a/plugins/AL_USDMaya/docs/workflows.md b/plugin/al/docs/workflows.md similarity index 100% rename from plugins/AL_USDMaya/docs/workflows.md rename to plugin/al/docs/workflows.md diff --git a/plugins/AL_USDMaya/doxygen/Doxyfile b/plugin/al/doxygen/Doxyfile similarity index 100% rename from plugins/AL_USDMaya/doxygen/Doxyfile rename to plugin/al/doxygen/Doxyfile diff --git a/plugins/AL_USDMaya/doxygen/mainpage.dox b/plugin/al/doxygen/mainpage.dox similarity index 100% rename from plugins/AL_USDMaya/doxygen/mainpage.dox rename to plugin/al/doxygen/mainpage.dox diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/docpages/docs_codegroups.h b/plugin/al/lib/AL_USDMaya/AL/docpages/docs_codegroups.h similarity index 100% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/docpages/docs_codegroups.h rename to plugin/al/lib/AL_USDMaya/AL/docpages/docs_codegroups.h diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/docpages/docs_events.h b/plugin/al/lib/AL_USDMaya/AL/docpages/docs_events.h similarity index 100% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/docpages/docs_events.h rename to plugin/al/lib/AL_USDMaya/AL/docpages/docs_events.h diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/docpages/docs_mayaevents.h b/plugin/al/lib/AL_USDMaya/AL/docpages/docs_mayaevents.h similarity index 100% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/docpages/docs_mayaevents.h rename to plugin/al/lib/AL_USDMaya/AL/docpages/docs_mayaevents.h diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/docpages/docs_mayahelpers.h b/plugin/al/lib/AL_USDMaya/AL/docpages/docs_mayahelpers.h similarity index 100% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/docpages/docs_mayahelpers.h rename to plugin/al/lib/AL_USDMaya/AL/docpages/docs_mayahelpers.h diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/docpages/docs_translator_plugins.h b/plugin/al/lib/AL_USDMaya/AL/docpages/docs_translator_plugins.h similarity index 100% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/docpages/docs_translator_plugins.h rename to plugin/al/lib/AL_USDMaya/AL/docpages/docs_translator_plugins.h diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/Api.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/Api.h similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/Api.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/Api.h index c35d98e4e1..a68ac4975f 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/Api.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/Api.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/CodeTimings.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/CodeTimings.cpp similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/CodeTimings.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/CodeTimings.cpp index 7d4ee21578..ed02f3f322 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/CodeTimings.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/CodeTimings.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/CodeTimings.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/CodeTimings.h similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/CodeTimings.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/CodeTimings.h index 965489f7cc..b2749eafd0 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/CodeTimings.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/CodeTimings.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/DebugCodes.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/DebugCodes.cpp similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/DebugCodes.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/DebugCodes.cpp index b66d89d9d9..c26fe1ee6d 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/DebugCodes.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/DebugCodes.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/DebugCodes.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/DebugCodes.h similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/DebugCodes.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/DebugCodes.h index fdf795918c..84f85b2686 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/DebugCodes.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/DebugCodes.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/DrivenTransformsData.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/DrivenTransformsData.cpp similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/DrivenTransformsData.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/DrivenTransformsData.cpp index a0ccdf1fbc..2ab145eca0 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/DrivenTransformsData.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/DrivenTransformsData.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/DrivenTransformsData.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/DrivenTransformsData.h similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/DrivenTransformsData.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/DrivenTransformsData.h index a27460d9a2..692d11313c 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/DrivenTransformsData.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/DrivenTransformsData.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/ForwardDeclares.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/ForwardDeclares.h similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/ForwardDeclares.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/ForwardDeclares.h index b8619bfee5..fbc8ee32d6 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/ForwardDeclares.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/ForwardDeclares.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/Global.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/Global.cpp similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/Global.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/Global.cpp index 8d4e16b568..e844ac22cd 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/Global.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/Global.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/Global.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/Global.h similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/Global.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/Global.h index 774bbb5783..e9a34ce9f4 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/Global.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/Global.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/Metadata.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/Metadata.cpp similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/Metadata.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/Metadata.cpp index f50ab98c99..e848b78c9b 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/Metadata.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/Metadata.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/Metadata.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/Metadata.h similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/Metadata.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/Metadata.h index 935eb272c7..8c598962b5 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/Metadata.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/Metadata.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/PluginRegister.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/PluginRegister.h similarity index 98% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/PluginRegister.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/PluginRegister.h index ad389643df..aa7f4fc42e 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/PluginRegister.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/PluginRegister.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -16,6 +16,9 @@ #pragma once #include "pxr/pxr.h" #include "pxr/imaging/glf/glew.h" +#include "pxr/imaging/glf/contextCaps.h" +#include "pxr/imaging/glf/glContext.h" + #include "AL/maya/utils/CommandGuiHelper.h" #include "AL/maya/utils/MenuBuilder.h" #include "AL/usdmaya/Global.h" @@ -158,6 +161,11 @@ template MStatus registerPlugin(AFnPlugin& plugin) { GlfGlewInit(); + // We may be in a non-gui maya... if so, + // GlfContextCaps::InitInstance() will error + if (GlfGLContext::GetCurrentGLContext()->IsValid()) { + GlfContextCaps::InitInstance(); + } if(!MGlobal::optionVarExists("AL_usdmaya_selectMode")) { diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/SelectabilityDB.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/SelectabilityDB.cpp similarity index 100% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/SelectabilityDB.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/SelectabilityDB.cpp diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/SelectabilityDB.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/SelectabilityDB.h similarity index 100% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/SelectabilityDB.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/SelectabilityDB.h diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/StageCache.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/StageCache.cpp similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/StageCache.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/StageCache.cpp index 2dd93b322f..fc2d1b9b43 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/StageCache.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/StageCache.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/StageCache.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/StageCache.h similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/StageCache.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/StageCache.h index 58c45028c0..85cdc30b71 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/StageCache.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/StageCache.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/StageData.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/StageData.cpp similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/StageData.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/StageData.cpp index 0c50cb238e..958331cfb2 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/StageData.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/StageData.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/StageData.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/StageData.h similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/StageData.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/StageData.h index 21d070915e..fd3e2fbc58 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/StageData.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/StageData.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/TransformOperation.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/TransformOperation.cpp similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/TransformOperation.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/TransformOperation.cpp index d4ed63f557..2fc31b6111 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/TransformOperation.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/TransformOperation.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/TransformOperation.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/TransformOperation.h similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/TransformOperation.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/TransformOperation.h index 8b9332c01f..5f9f0afcb8 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/TransformOperation.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/TransformOperation.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/TypeIDs.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/TypeIDs.h similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/TypeIDs.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/TypeIDs.h index 38cdc68fd2..fad71310c2 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/TypeIDs.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/TypeIDs.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/Version.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/Version.h similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/Version.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/Version.h index a3a68c1d98..61c0ddbe16 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/Version.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/Version.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -12,6 +12,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. +// #pragma once diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/cmds/CreateUsdPrim.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/CreateUsdPrim.cpp similarity index 100% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/cmds/CreateUsdPrim.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/CreateUsdPrim.cpp diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/cmds/CreateUsdPrim.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/CreateUsdPrim.h similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/cmds/CreateUsdPrim.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/CreateUsdPrim.h index 9dfbb8b75a..93b737cffc 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/cmds/CreateUsdPrim.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/CreateUsdPrim.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/cmds/DebugCommands.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/DebugCommands.cpp similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/cmds/DebugCommands.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/DebugCommands.cpp index 260d25c689..c7b4ea6a73 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/cmds/DebugCommands.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/DebugCommands.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/cmds/DebugCommands.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/DebugCommands.h similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/cmds/DebugCommands.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/DebugCommands.h index 1f42ecf855..0e29871d9c 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/cmds/DebugCommands.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/DebugCommands.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/cmds/EventCommand.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/EventCommand.cpp similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/cmds/EventCommand.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/EventCommand.cpp index 00e5f2b0df..1786e910f3 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/cmds/EventCommand.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/EventCommand.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/cmds/EventCommand.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/EventCommand.h similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/cmds/EventCommand.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/EventCommand.h index bf6dea4dcf..76aa18dca9 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/cmds/EventCommand.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/EventCommand.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/cmds/LayerCommands.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/LayerCommands.cpp similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/cmds/LayerCommands.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/LayerCommands.cpp index 53892d4b62..3ee8ad16ec 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/cmds/LayerCommands.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/LayerCommands.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/cmds/LayerCommands.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/LayerCommands.h similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/cmds/LayerCommands.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/LayerCommands.h index 2edc07fd82..dbf2f25e44 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/cmds/LayerCommands.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/LayerCommands.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/cmds/ProxyShapeCommands.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/ProxyShapeCommands.cpp similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/cmds/ProxyShapeCommands.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/ProxyShapeCommands.cpp index 5c0786b93d..f9fbb5d1c3 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/cmds/ProxyShapeCommands.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/ProxyShapeCommands.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/cmds/ProxyShapeCommands.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/ProxyShapeCommands.h similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/cmds/ProxyShapeCommands.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/ProxyShapeCommands.h index 3ac43d35e0..e4839cbda7 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/cmds/ProxyShapeCommands.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/ProxyShapeCommands.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/cmds/ProxyShapePostLoadProcess.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/ProxyShapePostLoadProcess.cpp similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/cmds/ProxyShapePostLoadProcess.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/ProxyShapePostLoadProcess.cpp index caaed2127d..540e5b0f6d 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/cmds/ProxyShapePostLoadProcess.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/ProxyShapePostLoadProcess.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/cmds/ProxyShapePostLoadProcess.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/ProxyShapePostLoadProcess.h similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/cmds/ProxyShapePostLoadProcess.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/ProxyShapePostLoadProcess.h index 43e51d4f88..04517be759 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/cmds/ProxyShapePostLoadProcess.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/ProxyShapePostLoadProcess.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/cmds/ProxyShapeSelectCommands.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/ProxyShapeSelectCommands.cpp similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/cmds/ProxyShapeSelectCommands.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/ProxyShapeSelectCommands.cpp index 9fafd703b8..948a39ec49 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/cmds/ProxyShapeSelectCommands.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/ProxyShapeSelectCommands.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/cmds/ProxyShapeSelectCommands.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/ProxyShapeSelectCommands.h similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/cmds/ProxyShapeSelectCommands.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/ProxyShapeSelectCommands.h index 6d91c88009..8e5bf90bc5 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/cmds/ProxyShapeSelectCommands.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/ProxyShapeSelectCommands.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/cmds/RendererCommands.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/RendererCommands.cpp similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/cmds/RendererCommands.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/RendererCommands.cpp index 596a0839f5..16cb7efb77 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/cmds/RendererCommands.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/RendererCommands.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/cmds/RendererCommands.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/RendererCommands.h similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/cmds/RendererCommands.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/RendererCommands.h index 363c4da6ae..4578c5654a 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/cmds/RendererCommands.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/RendererCommands.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/cmds/UnloadPrim.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/UnloadPrim.cpp similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/cmds/UnloadPrim.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/UnloadPrim.cpp index 221d25d245..9bab618432 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/cmds/UnloadPrim.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/UnloadPrim.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/cmds/UnloadPrim.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/UnloadPrim.h similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/cmds/UnloadPrim.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/UnloadPrim.h index a9b65f3dda..40c6228290 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/cmds/UnloadPrim.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/UnloadPrim.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/AnimationTranslator.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/AnimationTranslator.cpp similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/AnimationTranslator.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/AnimationTranslator.cpp index fdce26be87..0ccc5e5273 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/AnimationTranslator.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/AnimationTranslator.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/AnimationTranslator.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/AnimationTranslator.h similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/AnimationTranslator.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/AnimationTranslator.h index 10800ae3cb..cc1479d7d7 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/AnimationTranslator.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/AnimationTranslator.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/Export.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/Export.cpp similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/Export.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/Export.cpp index ad8d9a2dc4..1a521cb7cf 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/Export.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/Export.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/Export.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/Export.h similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/Export.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/Export.h index 3c2fcd27f3..5480b106e0 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/Export.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/Export.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/ExportParams.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/ExportParams.h similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/ExportParams.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/ExportParams.h index 7d9ebe043e..58adb682c5 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/ExportParams.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/ExportParams.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/ExportTranslator.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/ExportTranslator.cpp similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/ExportTranslator.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/ExportTranslator.cpp index da8e2e5cde..f23eff5d87 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/ExportTranslator.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/ExportTranslator.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/ExportTranslator.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/ExportTranslator.h similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/ExportTranslator.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/ExportTranslator.h index 00368eb4a7..be9c1b0aa5 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/ExportTranslator.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/ExportTranslator.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/Import.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/Import.cpp similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/Import.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/Import.cpp index 5735c48f87..d7321d9774 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/Import.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/Import.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/Import.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/Import.h similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/Import.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/Import.h index 0f8d60f88c..0d5f1373c1 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/Import.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/Import.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/ImportParams.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/ImportParams.h similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/ImportParams.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/ImportParams.h index 4e5d16aa2f..a060df3183 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/ImportParams.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/ImportParams.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/ImportTranslator.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/ImportTranslator.cpp similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/ImportTranslator.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/ImportTranslator.cpp index 1b6529b810..04d257b320 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/ImportTranslator.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/ImportTranslator.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/ImportTranslator.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/ImportTranslator.h similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/ImportTranslator.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/ImportTranslator.h index b31df553ff..0cd0dabaa7 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/ImportTranslator.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/ImportTranslator.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/NodeFactory.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/NodeFactory.cpp similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/NodeFactory.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/NodeFactory.cpp index b77f50a9d6..3d37302429 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/NodeFactory.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/NodeFactory.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/NodeFactory.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/NodeFactory.h similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/NodeFactory.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/NodeFactory.h index 9c921f65a0..be7cdc042e 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/NodeFactory.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/NodeFactory.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/SchemaPrims.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/SchemaPrims.cpp similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/SchemaPrims.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/SchemaPrims.cpp index ed149c1b3b..a24f0d0742 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/SchemaPrims.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/SchemaPrims.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/SchemaPrims.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/SchemaPrims.h similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/SchemaPrims.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/SchemaPrims.h index 2de7c738ab..a3f9ca8d09 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/SchemaPrims.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/SchemaPrims.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/TransformIterator.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/TransformIterator.cpp similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/TransformIterator.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/TransformIterator.cpp index 3b8ea8dcbf..f0e9da4d93 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/TransformIterator.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/TransformIterator.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -20,6 +20,8 @@ #include "pxr/usd/usd/stage.h" +#include + namespace AL { namespace usdmaya { namespace fileio { diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/TransformIterator.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/TransformIterator.h similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/TransformIterator.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/TransformIterator.h index 221d583f52..16ef8bfb43 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/TransformIterator.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/TransformIterator.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/CameraTranslator.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/CameraTranslator.cpp similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/CameraTranslator.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/CameraTranslator.cpp index 5dbb4f6157..1797623e7c 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/CameraTranslator.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/CameraTranslator.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/DagNodeTranslator.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/DagNodeTranslator.cpp similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/DagNodeTranslator.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/DagNodeTranslator.cpp index 292716898f..18c4536976 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/DagNodeTranslator.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/DagNodeTranslator.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/DagNodeTranslator.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/DagNodeTranslator.h similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/DagNodeTranslator.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/DagNodeTranslator.h index 06cdd452a7..2e8af27f45 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/DagNodeTranslator.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/DagNodeTranslator.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/DgNodeTranslator.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/DgNodeTranslator.cpp similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/DgNodeTranslator.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/DgNodeTranslator.cpp index 565a31985f..21f5811fce 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/DgNodeTranslator.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/DgNodeTranslator.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/DgNodeTranslator.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/DgNodeTranslator.h similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/DgNodeTranslator.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/DgNodeTranslator.h index 48c75d2144..91aaf19312 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/DgNodeTranslator.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/DgNodeTranslator.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/ExtraDataPlugin.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/ExtraDataPlugin.cpp similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/ExtraDataPlugin.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/ExtraDataPlugin.cpp index ed70dc0fcd..6488d0b2ba 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/ExtraDataPlugin.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/ExtraDataPlugin.cpp @@ -2,7 +2,7 @@ // Copyright 2019 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/ExtraDataPlugin.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/ExtraDataPlugin.h similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/ExtraDataPlugin.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/ExtraDataPlugin.h index 82f6b0c17e..0fc8054bff 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/ExtraDataPlugin.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/ExtraDataPlugin.h @@ -2,7 +2,7 @@ // Copyright 2018 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/MeshTranslator.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/MeshTranslator.cpp similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/MeshTranslator.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/MeshTranslator.cpp index f77a4c23be..8f344ab6ee 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/MeshTranslator.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/MeshTranslator.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/NurbsCurveTranslator.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/NurbsCurveTranslator.cpp similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/NurbsCurveTranslator.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/NurbsCurveTranslator.cpp index c8253e9065..28f7447645 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/NurbsCurveTranslator.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/NurbsCurveTranslator.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/README.md b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/README.md similarity index 100% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/README.md rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/README.md diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TestExtraDataPlugin.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TestExtraDataPlugin.cpp similarity index 100% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TestExtraDataPlugin.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TestExtraDataPlugin.cpp diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TestExtraDataPlugin.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TestExtraDataPlugin.h similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TestExtraDataPlugin.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TestExtraDataPlugin.h index 0bfe9dcc1c..bfc8a72b6d 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TestExtraDataPlugin.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TestExtraDataPlugin.h @@ -2,7 +2,7 @@ // Copyright 2018 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TransformTranslator.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TransformTranslator.cpp similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TransformTranslator.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TransformTranslator.cpp index c59ebc7771..eaf2dd0743 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TransformTranslator.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TransformTranslator.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TransformTranslator.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TransformTranslator.h similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TransformTranslator.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TransformTranslator.h index 21a122d2dc..263ecf9ad5 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TransformTranslator.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TransformTranslator.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorBase.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorBase.cpp similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorBase.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorBase.cpp index c6d8246fb0..59025bdad4 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorBase.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorBase.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorBase.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorBase.h similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorBase.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorBase.h index 24d21e3f4e..ac1427f3d8 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorBase.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorBase.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorContext.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorContext.cpp similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorContext.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorContext.cpp index 2469186786..9d275d82f3 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorContext.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorContext.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorContext.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorContext.h similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorContext.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorContext.h index 638c532183..1cb034c8be 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorContext.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorContext.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorTestPlugin.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorTestPlugin.cpp similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorTestPlugin.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorTestPlugin.cpp index 775a442826..3ba2f970d0 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorTestPlugin.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorTestPlugin.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorTestPlugin.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorTestPlugin.h similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorTestPlugin.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorTestPlugin.h index f25a225f4c..1c74980d19 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorTestPlugin.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorTestPlugin.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorTestType.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorTestType.cpp similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorTestType.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorTestType.cpp index 3c533656f6..87b94f3efe 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorTestType.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorTestType.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorTestType.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorTestType.h similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorTestType.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorTestType.h index bb70b5a3ad..a46002d80d 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorTestType.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorTestType.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/module.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/module.cpp similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/module.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/module.cpp index 92c1986b78..42c672d76e 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/module.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/module.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/moduleDeps.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/moduleDeps.cpp similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/moduleDeps.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/moduleDeps.cpp index 4b00f3bcd8..bfdadabb40 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/moduleDeps.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/moduleDeps.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/Engine.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/Engine.cpp similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/Engine.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/Engine.cpp index 9f8a3e4fe6..c426618deb 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/Engine.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/Engine.cpp @@ -2,7 +2,7 @@ // Copyright 2019 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/Engine.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/Engine.h similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/Engine.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/Engine.h index 1ea7a96400..24bd4713e5 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/Engine.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/Engine.h @@ -2,7 +2,7 @@ // Copyright 2019 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/Layer.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/Layer.cpp similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/Layer.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/Layer.cpp index 187569a0a3..87277e10fc 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/Layer.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/Layer.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/Layer.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/Layer.h similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/Layer.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/Layer.h index 2377cf6f88..a943cf3995 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/Layer.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/Layer.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/LayerManager.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/LayerManager.cpp similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/LayerManager.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/LayerManager.cpp index 4a10ba2d94..aca36e947a 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/LayerManager.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/LayerManager.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/LayerManager.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/LayerManager.h similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/LayerManager.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/LayerManager.h index 7152fd9cee..03e77aacbd 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/LayerManager.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/LayerManager.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/MeshAnimCreator.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/MeshAnimCreator.cpp similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/MeshAnimCreator.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/MeshAnimCreator.cpp index 5cfb452d8c..b6dca842c6 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/MeshAnimCreator.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/MeshAnimCreator.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/MeshAnimCreator.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/MeshAnimCreator.h similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/MeshAnimCreator.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/MeshAnimCreator.h index 28e6753cd8..0e0e083277 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/MeshAnimCreator.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/MeshAnimCreator.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/MeshAnimDeformer.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/MeshAnimDeformer.cpp similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/MeshAnimDeformer.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/MeshAnimDeformer.cpp index 6583efabe3..c7f8776622 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/MeshAnimDeformer.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/MeshAnimDeformer.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/MeshAnimDeformer.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/MeshAnimDeformer.h similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/MeshAnimDeformer.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/MeshAnimDeformer.h index cbdac82b9e..9013ad19b8 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/MeshAnimDeformer.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/MeshAnimDeformer.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyDrawOverride.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyDrawOverride.cpp similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyDrawOverride.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyDrawOverride.cpp index 37a4a90223..a9b7c1fe29 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyDrawOverride.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyDrawOverride.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyDrawOverride.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyDrawOverride.h similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyDrawOverride.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyDrawOverride.h index 330fbbcdd0..ce23eaeea3 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyDrawOverride.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyDrawOverride.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyShape.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyShape.cpp similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyShape.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyShape.cpp index 1ea5faa7d2..664c6c35dc 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyShape.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyShape.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyShape.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyShape.h similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyShape.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyShape.h index fe6e33e541..dac5279f6e 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyShape.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyShape.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyShapeSelection.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyShapeSelection.cpp similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyShapeSelection.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyShapeSelection.cpp index 13249719bb..c2485cb2d1 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyShapeSelection.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyShapeSelection.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyShapeUI.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyShapeUI.cpp similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyShapeUI.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyShapeUI.cpp index 756cb2f0b7..dedc8e709d 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyShapeUI.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyShapeUI.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -32,6 +32,10 @@ #include "maya/MPoint.h" #include "maya/MObjectArray.h" #include "maya/MPointArray.h" +#include "maya/MDrawInfo.h" +#include "maya/MDrawRequest.h" +#include "maya/MDrawRequestQueue.h" +#include "maya/MSelectInfo.h" #if defined(WANT_UFE_BUILD) #include "AL/usdmaya/TypeIDs.h" diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyShapeUI.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyShapeUI.h similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyShapeUI.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyShapeUI.h index 1e8074528e..645b03ccaf 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyShapeUI.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/ProxyShapeUI.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/RendererManager.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/RendererManager.cpp similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/RendererManager.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/RendererManager.cpp index 19907b5a6d..3d9cd347ca 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/RendererManager.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/RendererManager.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/RendererManager.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/RendererManager.h similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/RendererManager.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/RendererManager.h index 0b9549e6ad..de9e905d93 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/RendererManager.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/RendererManager.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/Transform.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/Transform.cpp similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/Transform.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/Transform.cpp index e06586927d..8f77a2723e 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/Transform.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/Transform.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/Transform.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/Transform.h similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/Transform.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/Transform.h index 751fa6141e..8ea14d79aa 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/Transform.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/Transform.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/TransformationMatrix.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/TransformationMatrix.cpp similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/TransformationMatrix.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/TransformationMatrix.cpp index 375cb0f58e..0fd5e3cb10 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/TransformationMatrix.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/TransformationMatrix.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/TransformationMatrix.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/TransformationMatrix.h similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/TransformationMatrix.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/TransformationMatrix.h index ad5b23e46c..94b8214ec5 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/TransformationMatrix.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/TransformationMatrix.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/proxy/DrivenTransforms.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/proxy/DrivenTransforms.cpp similarity index 100% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/proxy/DrivenTransforms.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/proxy/DrivenTransforms.cpp diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/proxy/DrivenTransforms.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/proxy/DrivenTransforms.h similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/proxy/DrivenTransforms.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/proxy/DrivenTransforms.h index 11b20fc456..4f64b6c2cc 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/proxy/DrivenTransforms.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/proxy/DrivenTransforms.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/proxy/PrimFilter.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/proxy/PrimFilter.cpp similarity index 100% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/proxy/PrimFilter.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/proxy/PrimFilter.cpp diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/proxy/PrimFilter.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/proxy/PrimFilter.h similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/proxy/PrimFilter.h rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/proxy/PrimFilter.h index a317582e4b..e250f232c0 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/proxy/PrimFilter.h +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/proxy/PrimFilter.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/wrapLayerManager.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/wrapLayerManager.cpp similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/wrapLayerManager.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/wrapLayerManager.cpp index f6b37add29..a99cfa6278 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/wrapLayerManager.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/wrapLayerManager.cpp @@ -2,7 +2,7 @@ // Copyright 2018 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/wrapProxyShape.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/wrapProxyShape.cpp similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/wrapProxyShape.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/wrapProxyShape.cpp index 78b6a6d2fa..d99797936d 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/nodes/wrapProxyShape.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/wrapProxyShape.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/wrapStageCache.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/wrapStageCache.cpp similarity index 99% rename from plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/wrapStageCache.cpp rename to plugin/al/lib/AL_USDMaya/AL/usdmaya/wrapStageCache.cpp index c0e6f1ac6b..f13b5bbe3d 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/AL/usdmaya/wrapStageCache.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/wrapStageCache.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/CMakeLists.txt b/plugin/al/lib/AL_USDMaya/CMakeLists.txt similarity index 100% rename from plugins/AL_USDMaya/lib/AL_USDMaya/CMakeLists.txt rename to plugin/al/lib/AL_USDMaya/CMakeLists.txt diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/Doxyfile b/plugin/al/lib/AL_USDMaya/Doxyfile similarity index 100% rename from plugins/AL_USDMaya/lib/AL_USDMaya/Doxyfile rename to plugin/al/lib/AL_USDMaya/Doxyfile diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/__init__.py b/plugin/al/lib/AL_USDMaya/__init__.py similarity index 97% rename from plugins/AL_USDMaya/lib/AL_USDMaya/__init__.py rename to plugin/al/lib/AL_USDMaya/__init__.py index bb363ffdbb..98c961ee39 100644 --- a/plugins/AL_USDMaya/lib/AL_USDMaya/__init__.py +++ b/plugin/al/lib/AL_USDMaya/__init__.py @@ -1,18 +1,18 @@ # # Copyright 2017 Animal Logic -# +# # Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License.# +# you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -# +# import _AL_USDMaya from pxr import Tf diff --git a/plugins/AL_USDMaya/lib/AL_USDMaya/plugInfo.json b/plugin/al/lib/AL_USDMaya/plugInfo.json similarity index 100% rename from plugins/AL_USDMaya/lib/AL_USDMaya/plugInfo.json rename to plugin/al/lib/AL_USDMaya/plugInfo.json diff --git a/plugins/AL_USDMaya/lib/CMakeLists.txt b/plugin/al/lib/CMakeLists.txt similarity index 100% rename from plugins/AL_USDMaya/lib/CMakeLists.txt rename to plugin/al/lib/CMakeLists.txt diff --git a/plugins/AL_USDMaya/mayatest/AL/maya/test/Api.h b/plugin/al/mayatest/AL/maya/test/Api.h similarity index 99% rename from plugins/AL_USDMaya/mayatest/AL/maya/test/Api.h rename to plugin/al/mayatest/AL/maya/test/Api.h index 3c9ecc2c49..028a76f864 100644 --- a/plugins/AL_USDMaya/mayatest/AL/maya/test/Api.h +++ b/plugin/al/mayatest/AL/maya/test/Api.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/mayatest/AL/maya/test/CMakeLists.txt b/plugin/al/mayatest/AL/maya/test/CMakeLists.txt similarity index 100% rename from plugins/AL_USDMaya/mayatest/AL/maya/test/CMakeLists.txt rename to plugin/al/mayatest/AL/maya/test/CMakeLists.txt diff --git a/plugins/AL_USDMaya/mayatest/AL/maya/test/testHarness.cpp b/plugin/al/mayatest/AL/maya/test/testHarness.cpp similarity index 99% rename from plugins/AL_USDMaya/mayatest/AL/maya/test/testHarness.cpp rename to plugin/al/mayatest/AL/maya/test/testHarness.cpp index 3f06644fe7..bf5d2005b1 100644 --- a/plugins/AL_USDMaya/mayatest/AL/maya/test/testHarness.cpp +++ b/plugin/al/mayatest/AL/maya/test/testHarness.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/mayatest/AL/maya/test/testHarness.h b/plugin/al/mayatest/AL/maya/test/testHarness.h similarity index 99% rename from plugins/AL_USDMaya/mayatest/AL/maya/test/testHarness.h rename to plugin/al/mayatest/AL/maya/test/testHarness.h index 06aefe1216..5d4e80cc65 100644 --- a/plugins/AL_USDMaya/mayatest/AL/maya/test/testHarness.h +++ b/plugin/al/mayatest/AL/maya/test/testHarness.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/mayatest/AL/maya/test/testHelpers.cpp b/plugin/al/mayatest/AL/maya/test/testHelpers.cpp similarity index 99% rename from plugins/AL_USDMaya/mayatest/AL/maya/test/testHelpers.cpp rename to plugin/al/mayatest/AL/maya/test/testHelpers.cpp index c1bd4e91f8..91646e8cef 100644 --- a/plugins/AL_USDMaya/mayatest/AL/maya/test/testHelpers.cpp +++ b/plugin/al/mayatest/AL/maya/test/testHelpers.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/mayatest/AL/maya/test/testHelpers.h b/plugin/al/mayatest/AL/maya/test/testHelpers.h similarity index 99% rename from plugins/AL_USDMaya/mayatest/AL/maya/test/testHelpers.h rename to plugin/al/mayatest/AL/maya/test/testHelpers.h index bd503d2e6a..39f12b1dbe 100644 --- a/plugins/AL_USDMaya/mayatest/AL/maya/test/testHelpers.h +++ b/plugin/al/mayatest/AL/maya/test/testHelpers.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/mayatest/CMakeLists.txt b/plugin/al/mayatest/CMakeLists.txt similarity index 100% rename from plugins/AL_USDMaya/mayatest/CMakeLists.txt rename to plugin/al/mayatest/CMakeLists.txt diff --git a/plugins/AL_USDMaya/mayautils/AL/maya/CMakeLists.txt b/plugin/al/mayautils/AL/maya/CMakeLists.txt similarity index 100% rename from plugins/AL_USDMaya/mayautils/AL/maya/CMakeLists.txt rename to plugin/al/mayautils/AL/maya/CMakeLists.txt diff --git a/plugins/AL_USDMaya/mayautils/AL/maya/event/Api.h b/plugin/al/mayautils/AL/maya/event/Api.h similarity index 99% rename from plugins/AL_USDMaya/mayautils/AL/maya/event/Api.h rename to plugin/al/mayautils/AL/maya/event/Api.h index afa3b64623..1983fa8acf 100644 --- a/plugins/AL_USDMaya/mayautils/AL/maya/event/Api.h +++ b/plugin/al/mayautils/AL/maya/event/Api.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/mayautils/AL/maya/event/MayaEventManager.cpp b/plugin/al/mayautils/AL/maya/event/MayaEventManager.cpp similarity index 99% rename from plugins/AL_USDMaya/mayautils/AL/maya/event/MayaEventManager.cpp rename to plugin/al/mayautils/AL/maya/event/MayaEventManager.cpp index 262de77255..3b3a6d49d0 100644 --- a/plugins/AL_USDMaya/mayautils/AL/maya/event/MayaEventManager.cpp +++ b/plugin/al/mayautils/AL/maya/event/MayaEventManager.cpp @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include diff --git a/plugins/AL_USDMaya/mayautils/AL/maya/event/MayaEventManager.h b/plugin/al/mayautils/AL/maya/event/MayaEventManager.h similarity index 99% rename from plugins/AL_USDMaya/mayautils/AL/maya/event/MayaEventManager.h rename to plugin/al/mayautils/AL/maya/event/MayaEventManager.h index cc92c29ebf..22407c9e7d 100644 --- a/plugins/AL_USDMaya/mayautils/AL/maya/event/MayaEventManager.h +++ b/plugin/al/mayautils/AL/maya/event/MayaEventManager.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/mayautils/AL/maya/tests/CMakeLists.txt b/plugin/al/mayautils/AL/maya/tests/CMakeLists.txt similarity index 100% rename from plugins/AL_USDMaya/mayautils/AL/maya/tests/CMakeLists.txt rename to plugin/al/mayautils/AL/maya/tests/CMakeLists.txt diff --git a/plugins/AL_USDMaya/mayautils/AL/maya/tests/mayaplugintest/CMakeLists.txt b/plugin/al/mayautils/AL/maya/tests/mayaplugintest/CMakeLists.txt similarity index 100% rename from plugins/AL_USDMaya/mayautils/AL/maya/tests/mayaplugintest/CMakeLists.txt rename to plugin/al/mayautils/AL/maya/tests/mayaplugintest/CMakeLists.txt diff --git a/plugins/AL_USDMaya/mayautils/AL/maya/tests/mayaplugintest/plugin.cpp b/plugin/al/mayautils/AL/maya/tests/mayaplugintest/plugin.cpp similarity index 99% rename from plugins/AL_USDMaya/mayautils/AL/maya/tests/mayaplugintest/plugin.cpp rename to plugin/al/mayautils/AL/maya/tests/mayaplugintest/plugin.cpp index dbec993586..165d0f8982 100644 --- a/plugins/AL_USDMaya/mayautils/AL/maya/tests/mayaplugintest/plugin.cpp +++ b/plugin/al/mayautils/AL/maya/tests/mayaplugintest/plugin.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/mayautils/AL/maya/tests/mayaplugintest/run_tests.mel b/plugin/al/mayautils/AL/maya/tests/mayaplugintest/run_tests.mel similarity index 100% rename from plugins/AL_USDMaya/mayautils/AL/maya/tests/mayaplugintest/run_tests.mel rename to plugin/al/mayautils/AL/maya/tests/mayaplugintest/run_tests.mel diff --git a/plugins/AL_USDMaya/mayautils/AL/maya/tests/mayaplugintest/run_tests.sh b/plugin/al/mayautils/AL/maya/tests/mayaplugintest/run_tests.sh similarity index 100% rename from plugins/AL_USDMaya/mayautils/AL/maya/tests/mayaplugintest/run_tests.sh rename to plugin/al/mayautils/AL/maya/tests/mayaplugintest/run_tests.sh diff --git a/plugins/AL_USDMaya/mayautils/AL/maya/tests/mayaplugintest/test_maya_MenuBuilder.cpp b/plugin/al/mayautils/AL/maya/tests/mayaplugintest/test_maya_MenuBuilder.cpp similarity index 99% rename from plugins/AL_USDMaya/mayautils/AL/maya/tests/mayaplugintest/test_maya_MenuBuilder.cpp rename to plugin/al/mayautils/AL/maya/tests/mayaplugintest/test_maya_MenuBuilder.cpp index bd518d145c..b46c116c5d 100644 --- a/plugins/AL_USDMaya/mayautils/AL/maya/tests/mayaplugintest/test_maya_MenuBuilder.cpp +++ b/plugin/al/mayautils/AL/maya/tests/mayaplugintest/test_maya_MenuBuilder.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/mayautils/AL/maya/tests/mayaplugintest/test_maya_NodeHelper.cpp b/plugin/al/mayautils/AL/maya/tests/mayaplugintest/test_maya_NodeHelper.cpp similarity index 99% rename from plugins/AL_USDMaya/mayautils/AL/maya/tests/mayaplugintest/test_maya_NodeHelper.cpp rename to plugin/al/mayautils/AL/maya/tests/mayaplugintest/test_maya_NodeHelper.cpp index fd3cfd4002..5f3c1c1616 100644 --- a/plugins/AL_USDMaya/mayautils/AL/maya/tests/mayaplugintest/test_maya_NodeHelper.cpp +++ b/plugin/al/mayautils/AL/maya/tests/mayaplugintest/test_maya_NodeHelper.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/mayautils/AL/maya/tests/mayaplugintest/test_mobjectmap.cpp b/plugin/al/mayautils/AL/maya/tests/mayaplugintest/test_mobjectmap.cpp similarity index 99% rename from plugins/AL_USDMaya/mayautils/AL/maya/tests/mayaplugintest/test_mobjectmap.cpp rename to plugin/al/mayautils/AL/maya/tests/mayaplugintest/test_mobjectmap.cpp index d727a88972..f7eef2b18b 100644 --- a/plugins/AL_USDMaya/mayautils/AL/maya/tests/mayaplugintest/test_mobjectmap.cpp +++ b/plugin/al/mayautils/AL/maya/tests/mayaplugintest/test_mobjectmap.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/mayautils/AL/maya/tests/mayaplugintest/utils/CommandGuiHelperTest.cpp b/plugin/al/mayautils/AL/maya/tests/mayaplugintest/utils/CommandGuiHelperTest.cpp similarity index 99% rename from plugins/AL_USDMaya/mayautils/AL/maya/tests/mayaplugintest/utils/CommandGuiHelperTest.cpp rename to plugin/al/mayautils/AL/maya/tests/mayaplugintest/utils/CommandGuiHelperTest.cpp index f2f00dfab9..acab1c0b70 100644 --- a/plugins/AL_USDMaya/mayautils/AL/maya/tests/mayaplugintest/utils/CommandGuiHelperTest.cpp +++ b/plugin/al/mayautils/AL/maya/tests/mayaplugintest/utils/CommandGuiHelperTest.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -22,6 +22,7 @@ #include "maya/MArgDatabase.h" #include +#include namespace AL { namespace maya { diff --git a/plugins/AL_USDMaya/mayautils/AL/maya/tests/mayaplugintest/utils/CommandGuiHelperTest.h b/plugin/al/mayautils/AL/maya/tests/mayaplugintest/utils/CommandGuiHelperTest.h similarity index 99% rename from plugins/AL_USDMaya/mayautils/AL/maya/tests/mayaplugintest/utils/CommandGuiHelperTest.h rename to plugin/al/mayautils/AL/maya/tests/mayaplugintest/utils/CommandGuiHelperTest.h index 699a909a77..0eaa5b3fef 100644 --- a/plugins/AL_USDMaya/mayautils/AL/maya/tests/mayaplugintest/utils/CommandGuiHelperTest.h +++ b/plugin/al/mayautils/AL/maya/tests/mayaplugintest/utils/CommandGuiHelperTest.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/mayautils/AL/maya/tests/mayaplugintest/utils/NodeHelperUnitTest.cpp b/plugin/al/mayautils/AL/maya/tests/mayaplugintest/utils/NodeHelperUnitTest.cpp similarity index 99% rename from plugins/AL_USDMaya/mayautils/AL/maya/tests/mayaplugintest/utils/NodeHelperUnitTest.cpp rename to plugin/al/mayautils/AL/maya/tests/mayaplugintest/utils/NodeHelperUnitTest.cpp index c6b9a9d951..c32a7a0ba0 100644 --- a/plugins/AL_USDMaya/mayautils/AL/maya/tests/mayaplugintest/utils/NodeHelperUnitTest.cpp +++ b/plugin/al/mayautils/AL/maya/tests/mayaplugintest/utils/NodeHelperUnitTest.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -24,6 +24,8 @@ #include "maya/MString.h" #include "maya/MGlobal.h" +#include + namespace AL { namespace maya { namespace tests { diff --git a/plugins/AL_USDMaya/mayautils/AL/maya/tests/mayaplugintest/utils/NodeHelperUnitTest.h b/plugin/al/mayautils/AL/maya/tests/mayaplugintest/utils/NodeHelperUnitTest.h similarity index 99% rename from plugins/AL_USDMaya/mayautils/AL/maya/tests/mayaplugintest/utils/NodeHelperUnitTest.h rename to plugin/al/mayautils/AL/maya/tests/mayaplugintest/utils/NodeHelperUnitTest.h index aed9d41a19..3c777b0caa 100644 --- a/plugins/AL_USDMaya/mayautils/AL/maya/tests/mayaplugintest/utils/NodeHelperUnitTest.h +++ b/plugin/al/mayautils/AL/maya/tests/mayaplugintest/utils/NodeHelperUnitTest.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/mayautils/AL/maya/utils/Api.h b/plugin/al/mayautils/AL/maya/utils/Api.h similarity index 99% rename from plugins/AL_USDMaya/mayautils/AL/maya/utils/Api.h rename to plugin/al/mayautils/AL/maya/utils/Api.h index 706cd5d1f1..f19c0a325c 100644 --- a/plugins/AL_USDMaya/mayautils/AL/maya/utils/Api.h +++ b/plugin/al/mayautils/AL/maya/utils/Api.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/mayautils/AL/maya/utils/CommandGuiHelper.cpp b/plugin/al/mayautils/AL/maya/utils/CommandGuiHelper.cpp similarity index 99% rename from plugins/AL_USDMaya/mayautils/AL/maya/utils/CommandGuiHelper.cpp rename to plugin/al/mayautils/AL/maya/utils/CommandGuiHelper.cpp index deffbefb10..356389ada6 100644 --- a/plugins/AL_USDMaya/mayautils/AL/maya/utils/CommandGuiHelper.cpp +++ b/plugin/al/mayautils/AL/maya/utils/CommandGuiHelper.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/mayautils/AL/maya/utils/CommandGuiHelper.h b/plugin/al/mayautils/AL/maya/utils/CommandGuiHelper.h similarity index 99% rename from plugins/AL_USDMaya/mayautils/AL/maya/utils/CommandGuiHelper.h rename to plugin/al/mayautils/AL/maya/utils/CommandGuiHelper.h index d28b22dafd..ea9edd4bce 100644 --- a/plugins/AL_USDMaya/mayautils/AL/maya/utils/CommandGuiHelper.h +++ b/plugin/al/mayautils/AL/maya/utils/CommandGuiHelper.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/mayautils/AL/maya/utils/DebugCodes.h b/plugin/al/mayautils/AL/maya/utils/DebugCodes.h similarity index 99% rename from plugins/AL_USDMaya/mayautils/AL/maya/utils/DebugCodes.h rename to plugin/al/mayautils/AL/maya/utils/DebugCodes.h index 94c07a67dc..aca5b68629 100644 --- a/plugins/AL_USDMaya/mayautils/AL/maya/utils/DebugCodes.h +++ b/plugin/al/mayautils/AL/maya/utils/DebugCodes.h @@ -2,7 +2,7 @@ // Copyright 2018 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/mayautils/AL/maya/utils/FileTranslatorBase.h b/plugin/al/mayautils/AL/maya/utils/FileTranslatorBase.h similarity index 99% rename from plugins/AL_USDMaya/mayautils/AL/maya/utils/FileTranslatorBase.h rename to plugin/al/mayautils/AL/maya/utils/FileTranslatorBase.h index a14416c741..834f1edc61 100644 --- a/plugins/AL_USDMaya/mayautils/AL/maya/utils/FileTranslatorBase.h +++ b/plugin/al/mayautils/AL/maya/utils/FileTranslatorBase.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/mayautils/AL/maya/utils/FileTranslatorOptions.cpp b/plugin/al/mayautils/AL/maya/utils/FileTranslatorOptions.cpp similarity index 99% rename from plugins/AL_USDMaya/mayautils/AL/maya/utils/FileTranslatorOptions.cpp rename to plugin/al/mayautils/AL/maya/utils/FileTranslatorOptions.cpp index aab3b82f39..3e23e66a9f 100644 --- a/plugins/AL_USDMaya/mayautils/AL/maya/utils/FileTranslatorOptions.cpp +++ b/plugin/al/mayautils/AL/maya/utils/FileTranslatorOptions.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/mayautils/AL/maya/utils/FileTranslatorOptions.h b/plugin/al/mayautils/AL/maya/utils/FileTranslatorOptions.h similarity index 99% rename from plugins/AL_USDMaya/mayautils/AL/maya/utils/FileTranslatorOptions.h rename to plugin/al/mayautils/AL/maya/utils/FileTranslatorOptions.h index 16f108b8dc..d1282b41d1 100644 --- a/plugins/AL_USDMaya/mayautils/AL/maya/utils/FileTranslatorOptions.h +++ b/plugin/al/mayautils/AL/maya/utils/FileTranslatorOptions.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/mayautils/AL/maya/utils/ForwardDeclares.h b/plugin/al/mayautils/AL/maya/utils/ForwardDeclares.h similarity index 99% rename from plugins/AL_USDMaya/mayautils/AL/maya/utils/ForwardDeclares.h rename to plugin/al/mayautils/AL/maya/utils/ForwardDeclares.h index ac2c49a6da..41899b4746 100644 --- a/plugins/AL_USDMaya/mayautils/AL/maya/utils/ForwardDeclares.h +++ b/plugin/al/mayautils/AL/maya/utils/ForwardDeclares.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/mayautils/AL/maya/utils/MObjectMap.h b/plugin/al/mayautils/AL/maya/utils/MObjectMap.h similarity index 99% rename from plugins/AL_USDMaya/mayautils/AL/maya/utils/MObjectMap.h rename to plugin/al/mayautils/AL/maya/utils/MObjectMap.h index 9b0e6e3d9e..525d5b8783 100644 --- a/plugins/AL_USDMaya/mayautils/AL/maya/utils/MObjectMap.h +++ b/plugin/al/mayautils/AL/maya/utils/MObjectMap.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/mayautils/AL/maya/utils/MayaHelperMacros.h b/plugin/al/mayautils/AL/maya/utils/MayaHelperMacros.h similarity index 100% rename from plugins/AL_USDMaya/mayautils/AL/maya/utils/MayaHelperMacros.h rename to plugin/al/mayautils/AL/maya/utils/MayaHelperMacros.h diff --git a/plugins/AL_USDMaya/mayautils/AL/maya/utils/MenuBuilder.cpp b/plugin/al/mayautils/AL/maya/utils/MenuBuilder.cpp similarity index 99% rename from plugins/AL_USDMaya/mayautils/AL/maya/utils/MenuBuilder.cpp rename to plugin/al/mayautils/AL/maya/utils/MenuBuilder.cpp index 4c55a49c5d..fa37d18a1b 100644 --- a/plugins/AL_USDMaya/mayautils/AL/maya/utils/MenuBuilder.cpp +++ b/plugin/al/mayautils/AL/maya/utils/MenuBuilder.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/mayautils/AL/maya/utils/MenuBuilder.h b/plugin/al/mayautils/AL/maya/utils/MenuBuilder.h similarity index 99% rename from plugins/AL_USDMaya/mayautils/AL/maya/utils/MenuBuilder.h rename to plugin/al/mayautils/AL/maya/utils/MenuBuilder.h index ef4135f2a8..63f04646d6 100644 --- a/plugins/AL_USDMaya/mayautils/AL/maya/utils/MenuBuilder.h +++ b/plugin/al/mayautils/AL/maya/utils/MenuBuilder.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -21,6 +21,7 @@ #include "maya/MString.h" #include "maya/MGlobal.h" +#include #include #include #include diff --git a/plugins/AL_USDMaya/mayautils/AL/maya/utils/NodeHelper.cpp b/plugin/al/mayautils/AL/maya/utils/NodeHelper.cpp similarity index 99% rename from plugins/AL_USDMaya/mayautils/AL/maya/utils/NodeHelper.cpp rename to plugin/al/mayautils/AL/maya/utils/NodeHelper.cpp index d0adcba615..ef07bd5871 100644 --- a/plugins/AL_USDMaya/mayautils/AL/maya/utils/NodeHelper.cpp +++ b/plugin/al/mayautils/AL/maya/utils/NodeHelper.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -40,6 +40,7 @@ #include "maya/MTime.h" #include "maya/MFnDoubleArrayData.h" +#include #include #include #include diff --git a/plugins/AL_USDMaya/mayautils/AL/maya/utils/NodeHelper.h b/plugin/al/mayautils/AL/maya/utils/NodeHelper.h similarity index 99% rename from plugins/AL_USDMaya/mayautils/AL/maya/utils/NodeHelper.h rename to plugin/al/mayautils/AL/maya/utils/NodeHelper.h index 69cfbdffc0..e8fe8f8d88 100644 --- a/plugins/AL_USDMaya/mayautils/AL/maya/utils/NodeHelper.h +++ b/plugin/al/mayautils/AL/maya/utils/NodeHelper.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/mayautils/AL/maya/utils/Utils.h b/plugin/al/mayautils/AL/maya/utils/Utils.h similarity index 100% rename from plugins/AL_USDMaya/mayautils/AL/maya/utils/Utils.h rename to plugin/al/mayautils/AL/maya/utils/Utils.h diff --git a/plugins/AL_USDMaya/mayautils/CMakeLists.txt b/plugin/al/mayautils/CMakeLists.txt similarity index 100% rename from plugins/AL_USDMaya/mayautils/CMakeLists.txt rename to plugin/al/mayautils/CMakeLists.txt diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaPlugin/Api.h b/plugin/al/plugin/AL_USDMayaPlugin/Api.h similarity index 99% rename from plugins/AL_USDMaya/plugin/AL_USDMayaPlugin/Api.h rename to plugin/al/plugin/AL_USDMayaPlugin/Api.h index 2a6803a69f..6726482f50 100644 --- a/plugins/AL_USDMaya/plugin/AL_USDMayaPlugin/Api.h +++ b/plugin/al/plugin/AL_USDMayaPlugin/Api.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaPlugin/CMakeLists.txt b/plugin/al/plugin/AL_USDMayaPlugin/CMakeLists.txt similarity index 81% rename from plugins/AL_USDMaya/plugin/AL_USDMayaPlugin/CMakeLists.txt rename to plugin/al/plugin/AL_USDMayaPlugin/CMakeLists.txt index 0fcbdd9586..60e3e8fc03 100644 --- a/plugins/AL_USDMaya/plugin/AL_USDMayaPlugin/CMakeLists.txt +++ b/plugin/al/plugin/AL_USDMayaPlugin/CMakeLists.txt @@ -33,13 +33,13 @@ target_include_directories(${PXR_PACKAGE} if(MSVC) set_target_properties(${PXR_PACKAGE} PROPERTIES SUFFIX ".mll") elseif(APPLE) - set(CMAKE_MACOSX_RPATH ON) set_target_properties(${PXR_PACKAGE} PROPERTIES PREFIX "" SUFFIX ".bundle" - BUILD_WITH_INSTALL_RPATH TRUE - INSTALL_RPATH "@loader_path/../lib;@loader_path/../../USD/lib;@loader_path/../../USD/third_party/maya/lib;${PXR_USD_LOCATION}/lib" + MACOSX_RPATH TRUE + INSTALL_RPATH_USE_LINK_PATH TRUE + INSTALL_RPATH "@loader_path/../lib;@loader_path/../../pxr/lib;@loader_path/../../pxr/maya/lib;${PXR_USD_LOCATION}/lib" ) else() # This puts the paths into RUNPATH instead of RPATH. @@ -50,8 +50,8 @@ else() set_target_properties(${PXR_PACKAGE} PROPERTIES PREFIX "" - INSTALL_RPATH "$ORIGIN/../lib:$ORIGIN/../../USD/lib:$ORIGIN/../../USD/third_party/maya/lib:${PXR_USD_LOCATION}/lib:${PXR_USD_LOCATION}/lib64" - BUILD_WITH_INSTALL_RPATH TRUE + INSTALL_RPATH_USE_LINK_PATH TRUE + INSTALL_RPATH "$ORIGIN/../lib:$ORIGIN/../../pxr/lib:$ORIGIN/../../pxr/maya/lib:${PXR_USD_LOCATION}/lib:${PXR_USD_LOCATION}/lib64" ) endif() diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaPlugin/plugin.cpp b/plugin/al/plugin/AL_USDMayaPlugin/plugin.cpp similarity index 99% rename from plugins/AL_USDMaya/plugin/AL_USDMayaPlugin/plugin.cpp rename to plugin/al/plugin/AL_USDMayaPlugin/plugin.cpp index f1efe31745..cb58d85866 100644 --- a/plugins/AL_USDMaya/plugin/AL_USDMayaPlugin/plugin.cpp +++ b/plugin/al/plugin/AL_USDMayaPlugin/plugin.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/maya/test_DiffCore.cpp b/plugin/al/plugin/AL_USDMayaTestPlugin/AL/maya/test_DiffCore.cpp similarity index 100% rename from plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/maya/test_DiffCore.cpp rename to plugin/al/plugin/AL_USDMayaTestPlugin/AL/maya/test_DiffCore.cpp diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/maya/test_EventHandler.cpp b/plugin/al/plugin/AL_USDMayaTestPlugin/AL/maya/test_EventHandler.cpp similarity index 100% rename from plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/maya/test_EventHandler.cpp rename to plugin/al/plugin/AL_USDMayaTestPlugin/AL/maya/test_EventHandler.cpp diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/maya/test_MatrixToSRT.cpp b/plugin/al/plugin/AL_USDMayaTestPlugin/AL/maya/test_MatrixToSRT.cpp similarity index 100% rename from plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/maya/test_MatrixToSRT.cpp rename to plugin/al/plugin/AL_USDMayaTestPlugin/AL/maya/test_MatrixToSRT.cpp diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/maya/test_MayaEventManager.cpp b/plugin/al/plugin/AL_USDMayaTestPlugin/AL/maya/test_MayaEventManager.cpp similarity index 99% rename from plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/maya/test_MayaEventManager.cpp rename to plugin/al/plugin/AL_USDMayaTestPlugin/AL/maya/test_MayaEventManager.cpp index e7caf0243b..2b5643f536 100644 --- a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/maya/test_MayaEventManager.cpp +++ b/plugin/al/plugin/AL_USDMayaTestPlugin/AL/maya/test_MayaEventManager.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/commands/test_ExportCommands.cpp b/plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/commands/test_ExportCommands.cpp similarity index 99% rename from plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/commands/test_ExportCommands.cpp rename to plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/commands/test_ExportCommands.cpp index d7fd2af0ed..3a44e0a735 100644 --- a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/commands/test_ExportCommands.cpp +++ b/plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/commands/test_ExportCommands.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/commands/test_InternalProxySelection.cpp b/plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/commands/test_InternalProxySelection.cpp similarity index 99% rename from plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/commands/test_InternalProxySelection.cpp rename to plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/commands/test_InternalProxySelection.cpp index 2b08c1d6b6..616511d99c 100644 --- a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/commands/test_InternalProxySelection.cpp +++ b/plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/commands/test_InternalProxySelection.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/commands/test_LayerCommands.cpp b/plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/commands/test_LayerCommands.cpp similarity index 99% rename from plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/commands/test_LayerCommands.cpp rename to plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/commands/test_LayerCommands.cpp index 18d26fc668..f1d934e810 100644 --- a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/commands/test_LayerCommands.cpp +++ b/plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/commands/test_LayerCommands.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/commands/test_LayerManagerCommands.cpp b/plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/commands/test_LayerManagerCommands.cpp similarity index 99% rename from plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/commands/test_LayerManagerCommands.cpp rename to plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/commands/test_LayerManagerCommands.cpp index 449a060079..3ebd5aeb78 100644 --- a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/commands/test_LayerManagerCommands.cpp +++ b/plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/commands/test_LayerManagerCommands.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/commands/test_ProxyShapeImport.cpp b/plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/commands/test_ProxyShapeImport.cpp similarity index 99% rename from plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/commands/test_ProxyShapeImport.cpp rename to plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/commands/test_ProxyShapeImport.cpp index 67e4866c69..979f5539a2 100644 --- a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/commands/test_ProxyShapeImport.cpp +++ b/plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/commands/test_ProxyShapeImport.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/commands/test_ProxyShapeSelect.cpp b/plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/commands/test_ProxyShapeSelect.cpp similarity index 99% rename from plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/commands/test_ProxyShapeSelect.cpp rename to plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/commands/test_ProxyShapeSelect.cpp index 0780b08890..c71305c397 100644 --- a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/commands/test_ProxyShapeSelect.cpp +++ b/plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/commands/test_ProxyShapeSelect.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/commands/test_TranslateCommand.cpp b/plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/commands/test_TranslateCommand.cpp similarity index 100% rename from plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/commands/test_TranslateCommand.cpp rename to plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/commands/test_TranslateCommand.cpp diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/fileio/export_blendshape.cpp b/plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/fileio/export_blendshape.cpp similarity index 100% rename from plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/fileio/export_blendshape.cpp rename to plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/fileio/export_blendshape.cpp diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/fileio/export_constraints.cpp b/plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/fileio/export_constraints.cpp similarity index 100% rename from plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/fileio/export_constraints.cpp rename to plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/fileio/export_constraints.cpp diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/fileio/export_ik.cpp b/plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/fileio/export_ik.cpp similarity index 100% rename from plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/fileio/export_ik.cpp rename to plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/fileio/export_ik.cpp diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/fileio/export_import_instancing.cpp b/plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/fileio/export_import_instancing.cpp similarity index 100% rename from plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/fileio/export_import_instancing.cpp rename to plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/fileio/export_import_instancing.cpp diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/fileio/export_lattice.cpp b/plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/fileio/export_lattice.cpp similarity index 100% rename from plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/fileio/export_lattice.cpp rename to plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/fileio/export_lattice.cpp diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/fileio/export_multiple_shapes.cpp b/plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/fileio/export_multiple_shapes.cpp similarity index 100% rename from plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/fileio/export_multiple_shapes.cpp rename to plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/fileio/export_multiple_shapes.cpp diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/fileio/export_nonlinear.cpp b/plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/fileio/export_nonlinear.cpp similarity index 100% rename from plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/fileio/export_nonlinear.cpp rename to plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/fileio/export_nonlinear.cpp diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/fileio/export_unmerged.cpp b/plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/fileio/export_unmerged.cpp similarity index 100% rename from plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/fileio/export_unmerged.cpp rename to plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/fileio/export_unmerged.cpp diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/proxy/test_DrivenTransforms.cpp b/plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/proxy/test_DrivenTransforms.cpp similarity index 99% rename from plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/proxy/test_DrivenTransforms.cpp rename to plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/proxy/test_DrivenTransforms.cpp index bc7125ea92..03d8ebcbd5 100644 --- a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/proxy/test_DrivenTransforms.cpp +++ b/plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/proxy/test_DrivenTransforms.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/proxy/test_PrimFilter.cpp b/plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/proxy/test_PrimFilter.cpp similarity index 99% rename from plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/proxy/test_PrimFilter.cpp rename to plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/proxy/test_PrimFilter.cpp index 79d0dcee10..db6793accb 100644 --- a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/proxy/test_PrimFilter.cpp +++ b/plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/proxy/test_PrimFilter.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_ActiveInactive.cpp b/plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_ActiveInactive.cpp similarity index 99% rename from plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_ActiveInactive.cpp rename to plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_ActiveInactive.cpp index 71bcb11157..c5cc4b9bf0 100644 --- a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_ActiveInactive.cpp +++ b/plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_ActiveInactive.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_ExtraDataPlugin.cpp b/plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_ExtraDataPlugin.cpp similarity index 99% rename from plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_ExtraDataPlugin.cpp rename to plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_ExtraDataPlugin.cpp index 2744b133ff..d8f0787d18 100644 --- a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_ExtraDataPlugin.cpp +++ b/plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_ExtraDataPlugin.cpp @@ -2,7 +2,7 @@ // Copyright 2019 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_LayerManager.cpp b/plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_LayerManager.cpp similarity index 99% rename from plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_LayerManager.cpp rename to plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_LayerManager.cpp index 2429aca91c..062a903d86 100644 --- a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_LayerManager.cpp +++ b/plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_LayerManager.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_ProxyShape.cpp b/plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_ProxyShape.cpp similarity index 99% rename from plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_ProxyShape.cpp rename to plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_ProxyShape.cpp index ace30afa20..ecc87c51da 100644 --- a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_ProxyShape.cpp +++ b/plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_ProxyShape.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_ProxyShapeSelectabilityDB.cpp b/plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_ProxyShapeSelectabilityDB.cpp similarity index 99% rename from plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_ProxyShapeSelectabilityDB.cpp rename to plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_ProxyShapeSelectabilityDB.cpp index 792ee65d28..e0fad5785c 100644 --- a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_ProxyShapeSelectabilityDB.cpp +++ b/plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_ProxyShapeSelectabilityDB.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_Transform.cpp b/plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_Transform.cpp similarity index 99% rename from plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_Transform.cpp rename to plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_Transform.cpp index 5b652a0e65..d7516bd6d5 100644 --- a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_Transform.cpp +++ b/plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_Transform.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_TransformMatrix.cpp b/plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_TransformMatrix.cpp similarity index 99% rename from plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_TransformMatrix.cpp rename to plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_TransformMatrix.cpp index 5eedea8ec1..9b37437d01 100644 --- a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_TransformMatrix.cpp +++ b/plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_TransformMatrix.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_TranslatorContext.cpp b/plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_TranslatorContext.cpp similarity index 99% rename from plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_TranslatorContext.cpp rename to plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_TranslatorContext.cpp index 9da2387db3..609fbb8222 100644 --- a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_TranslatorContext.cpp +++ b/plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/nodes/test_TranslatorContext.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/test_DiffPrimVar.cpp b/plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/test_DiffPrimVar.cpp similarity index 99% rename from plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/test_DiffPrimVar.cpp rename to plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/test_DiffPrimVar.cpp index e5917dc829..266ce22254 100644 --- a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/test_DiffPrimVar.cpp +++ b/plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/test_DiffPrimVar.cpp @@ -2,7 +2,7 @@ // Copyright 2018 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/test_SelectabilityDB.cpp b/plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/test_SelectabilityDB.cpp similarity index 99% rename from plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/test_SelectabilityDB.cpp rename to plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/test_SelectabilityDB.cpp index adcc034aae..13b905ab90 100644 --- a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/AL/usdmaya/test_SelectabilityDB.cpp +++ b/plugin/al/plugin/AL_USDMayaTestPlugin/AL/usdmaya/test_SelectabilityDB.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/Api.h b/plugin/al/plugin/AL_USDMayaTestPlugin/Api.h similarity index 99% rename from plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/Api.h rename to plugin/al/plugin/AL_USDMayaTestPlugin/Api.h index f041356505..0386dcc7a3 100644 --- a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/Api.h +++ b/plugin/al/plugin/AL_USDMayaTestPlugin/Api.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/CMakeLists.txt b/plugin/al/plugin/AL_USDMayaTestPlugin/CMakeLists.txt similarity index 90% rename from plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/CMakeLists.txt rename to plugin/al/plugin/AL_USDMayaTestPlugin/CMakeLists.txt index 1e40c912a7..f942064306 100644 --- a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/CMakeLists.txt +++ b/plugin/al/plugin/AL_USDMayaTestPlugin/CMakeLists.txt @@ -81,20 +81,20 @@ PRIVATE if(MSVC) set_target_properties(${PXR_PACKAGE} PROPERTIES SUFFIX ".mll") elseif(APPLE) - set(CMAKE_MACOSX_RPATH ON) set_target_properties(${PXR_PACKAGE} PROPERTIES PREFIX "" SUFFIX ".bundle" - BUILD_WITH_INSTALL_RPATH TRUE - INSTALL_RPATH "@loader_path/../lib;@loader_path/../../USD/lib;@loader_path/../../USD/third_party/maya/lib;${PXR_USD_LOCATION}/lib" + MACOSX_RPATH TRUE + INSTALL_RPATH_USE_LINK_PATH TRUE + INSTALL_RPATH "@loader_path/../lib;@loader_path/../../pxr/lib;@loader_path/../../pxr/maya/lib;${PXR_USD_LOCATION}/lib" ) else() set_target_properties(${PXR_PACKAGE} PROPERTIES PREFIX "" - BUILD_WITH_INSTALL_RPATH TRUE - INSTALL_RPATH "$ORIGIN/../lib:$ORIGIN/../../USD/lib:$ORIGIN/../../USD/third_party/maya/lib:${PXR_USD_LOCATION}/lib:${PXR_USD_LOCATION}/lib64" + INSTALL_RPATH_USE_LINK_PATH TRUE + INSTALL_RPATH "$ORIGIN/../lib:$ORIGIN/../../pxr/lib:$ORIGIN/../../pxr/maya/lib:${PXR_USD_LOCATION}/lib:${PXR_USD_LOCATION}/lib64" ) endif() diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/plugin.cpp b/plugin/al/plugin/AL_USDMayaTestPlugin/plugin.cpp similarity index 99% rename from plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/plugin.cpp rename to plugin/al/plugin/AL_USDMayaTestPlugin/plugin.cpp index 71f8a1fcb8..f9b25f892d 100644 --- a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/plugin.cpp +++ b/plugin/al/plugin/AL_USDMayaTestPlugin/plugin.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/run_mayaplugin_tests.mel b/plugin/al/plugin/AL_USDMayaTestPlugin/run_mayaplugin_tests.mel similarity index 100% rename from plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/run_mayaplugin_tests.mel rename to plugin/al/plugin/AL_USDMayaTestPlugin/run_mayaplugin_tests.mel diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/run_mayaplugin_tests.sh b/plugin/al/plugin/AL_USDMayaTestPlugin/run_mayaplugin_tests.sh similarity index 100% rename from plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/run_mayaplugin_tests.sh rename to plugin/al/plugin/AL_USDMayaTestPlugin/run_mayaplugin_tests.sh diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/test_data/cube.usda b/plugin/al/plugin/AL_USDMayaTestPlugin/test_data/cube.usda similarity index 100% rename from plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/test_data/cube.usda rename to plugin/al/plugin/AL_USDMayaTestPlugin/test_data/cube.usda diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/test_data/cube_moving_zaxis.usda b/plugin/al/plugin/AL_USDMayaTestPlugin/test_data/cube_moving_zaxis.usda similarity index 100% rename from plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/test_data/cube_moving_zaxis.usda rename to plugin/al/plugin/AL_USDMayaTestPlugin/test_data/cube_moving_zaxis.usda diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/test_data/referencedLayer.usda b/plugin/al/plugin/AL_USDMayaTestPlugin/test_data/referencedLayer.usda similarity index 100% rename from plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/test_data/referencedLayer.usda rename to plugin/al/plugin/AL_USDMayaTestPlugin/test_data/referencedLayer.usda diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/test_data/root.usda b/plugin/al/plugin/AL_USDMayaTestPlugin/test_data/root.usda similarity index 100% rename from plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/test_data/root.usda rename to plugin/al/plugin/AL_USDMayaTestPlugin/test_data/root.usda diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/test_data/sphere.usda b/plugin/al/plugin/AL_USDMayaTestPlugin/test_data/sphere.usda similarity index 100% rename from plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/test_data/sphere.usda rename to plugin/al/plugin/AL_USDMayaTestPlugin/test_data/sphere.usda diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/test_data/sphere2.usda b/plugin/al/plugin/AL_USDMayaTestPlugin/test_data/sphere2.usda similarity index 100% rename from plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/test_data/sphere2.usda rename to plugin/al/plugin/AL_USDMayaTestPlugin/test_data/sphere2.usda diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/test_data/subLayer.usda b/plugin/al/plugin/AL_USDMayaTestPlugin/test_data/subLayer.usda similarity index 100% rename from plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/test_data/subLayer.usda rename to plugin/al/plugin/AL_USDMayaTestPlugin/test_data/subLayer.usda diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/test_translators_AnimationTranslator.cpp b/plugin/al/plugin/AL_USDMayaTestPlugin/test_translators_AnimationTranslator.cpp similarity index 99% rename from plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/test_translators_AnimationTranslator.cpp rename to plugin/al/plugin/AL_USDMayaTestPlugin/test_translators_AnimationTranslator.cpp index 3cf1d9d423..0d6c70576b 100644 --- a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/test_translators_AnimationTranslator.cpp +++ b/plugin/al/plugin/AL_USDMayaTestPlugin/test_translators_AnimationTranslator.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/test_translators_CameraTranslator.cpp b/plugin/al/plugin/AL_USDMayaTestPlugin/test_translators_CameraTranslator.cpp similarity index 99% rename from plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/test_translators_CameraTranslator.cpp rename to plugin/al/plugin/AL_USDMayaTestPlugin/test_translators_CameraTranslator.cpp index fa8ee50787..9fc8ef43b3 100644 --- a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/test_translators_CameraTranslator.cpp +++ b/plugin/al/plugin/AL_USDMayaTestPlugin/test_translators_CameraTranslator.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/test_translators_DgTranslator.cpp b/plugin/al/plugin/AL_USDMayaTestPlugin/test_translators_DgTranslator.cpp similarity index 99% rename from plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/test_translators_DgTranslator.cpp rename to plugin/al/plugin/AL_USDMayaTestPlugin/test_translators_DgTranslator.cpp index f9b0bc1311..d736afd2c1 100644 --- a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/test_translators_DgTranslator.cpp +++ b/plugin/al/plugin/AL_USDMayaTestPlugin/test_translators_DgTranslator.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/test_translators_MeshTranslator.cpp b/plugin/al/plugin/AL_USDMayaTestPlugin/test_translators_MeshTranslator.cpp similarity index 99% rename from plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/test_translators_MeshTranslator.cpp rename to plugin/al/plugin/AL_USDMayaTestPlugin/test_translators_MeshTranslator.cpp index 75260e6c98..5e9e91e985 100644 --- a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/test_translators_MeshTranslator.cpp +++ b/plugin/al/plugin/AL_USDMayaTestPlugin/test_translators_MeshTranslator.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/test_translators_NurbsCurveTranslator.cpp b/plugin/al/plugin/AL_USDMayaTestPlugin/test_translators_NurbsCurveTranslator.cpp similarity index 99% rename from plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/test_translators_NurbsCurveTranslator.cpp rename to plugin/al/plugin/AL_USDMayaTestPlugin/test_translators_NurbsCurveTranslator.cpp index fac4f06e66..f46e6ac838 100644 --- a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/test_translators_NurbsCurveTranslator.cpp +++ b/plugin/al/plugin/AL_USDMayaTestPlugin/test_translators_NurbsCurveTranslator.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/test_translators_TransformTranslator.cpp b/plugin/al/plugin/AL_USDMayaTestPlugin/test_translators_TransformTranslator.cpp similarity index 99% rename from plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/test_translators_TransformTranslator.cpp rename to plugin/al/plugin/AL_USDMayaTestPlugin/test_translators_TransformTranslator.cpp index 2bada479e7..1e95d9cfbf 100644 --- a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/test_translators_TransformTranslator.cpp +++ b/plugin/al/plugin/AL_USDMayaTestPlugin/test_translators_TransformTranslator.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/test_translators_Translator.cpp b/plugin/al/plugin/AL_USDMayaTestPlugin/test_translators_Translator.cpp similarity index 99% rename from plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/test_translators_Translator.cpp rename to plugin/al/plugin/AL_USDMayaTestPlugin/test_translators_Translator.cpp index 35f2bca7d4..0c6fec2834 100644 --- a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/test_translators_Translator.cpp +++ b/plugin/al/plugin/AL_USDMayaTestPlugin/test_translators_Translator.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/test_usdmaya.cpp b/plugin/al/plugin/AL_USDMayaTestPlugin/test_usdmaya.cpp similarity index 99% rename from plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/test_usdmaya.cpp rename to plugin/al/plugin/AL_USDMayaTestPlugin/test_usdmaya.cpp index b9c1a0ae28..30c00a21fc 100644 --- a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/test_usdmaya.cpp +++ b/plugin/al/plugin/AL_USDMayaTestPlugin/test_usdmaya.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/test_usdmaya.h b/plugin/al/plugin/AL_USDMayaTestPlugin/test_usdmaya.h similarity index 99% rename from plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/test_usdmaya.h rename to plugin/al/plugin/AL_USDMayaTestPlugin/test_usdmaya.h index 9ff1193644..d64e7cbb3f 100644 --- a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/test_usdmaya.h +++ b/plugin/al/plugin/AL_USDMayaTestPlugin/test_usdmaya.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/test_usdmaya_AttributeType.cpp b/plugin/al/plugin/AL_USDMayaTestPlugin/test_usdmaya_AttributeType.cpp similarity index 99% rename from plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/test_usdmaya_AttributeType.cpp rename to plugin/al/plugin/AL_USDMayaTestPlugin/test_usdmaya_AttributeType.cpp index 3ffa228aee..e8dabb9a7e 100644 --- a/plugins/AL_USDMaya/plugin/AL_USDMayaTestPlugin/test_usdmaya_AttributeType.cpp +++ b/plugin/al/plugin/AL_USDMayaTestPlugin/test_usdmaya_AttributeType.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/plugin/CMakeLists.txt b/plugin/al/plugin/CMakeLists.txt similarity index 100% rename from plugins/AL_USDMaya/plugin/CMakeLists.txt rename to plugin/al/plugin/CMakeLists.txt diff --git a/plugins/AL_USDMaya/samples/animatedCamera1.usda b/plugin/al/samples/animatedCamera1.usda similarity index 100% rename from plugins/AL_USDMaya/samples/animatedCamera1.usda rename to plugin/al/samples/animatedCamera1.usda diff --git a/plugins/AL_USDMaya/samples/colours/faceColours.ma b/plugin/al/samples/colours/faceColours.ma similarity index 100% rename from plugins/AL_USDMaya/samples/colours/faceColours.ma rename to plugin/al/samples/colours/faceColours.ma diff --git a/plugins/AL_USDMaya/samples/colours/meshColours.usda b/plugin/al/samples/colours/meshColours.usda similarity index 100% rename from plugins/AL_USDMaya/samples/colours/meshColours.usda rename to plugin/al/samples/colours/meshColours.usda diff --git a/plugins/AL_USDMaya/samples/colours/meshExcludeFromProxy.usda b/plugin/al/samples/colours/meshExcludeFromProxy.usda similarity index 100% rename from plugins/AL_USDMaya/samples/colours/meshExcludeFromProxy.usda rename to plugin/al/samples/colours/meshExcludeFromProxy.usda diff --git a/plugins/AL_USDMaya/samples/simpleAnimatedCamera1.ma b/plugin/al/samples/simpleAnimatedCamera1.ma similarity index 100% rename from plugins/AL_USDMaya/samples/simpleAnimatedCamera1.ma rename to plugin/al/samples/simpleAnimatedCamera1.ma diff --git a/plugins/AL_USDMaya/samples/testchar_animallogo01_surfgeo_highres.usd b/plugin/al/samples/testchar_animallogo01_surfgeo_highres.usd similarity index 100% rename from plugins/AL_USDMaya/samples/testchar_animallogo01_surfgeo_highres.usd rename to plugin/al/samples/testchar_animallogo01_surfgeo_highres.usd diff --git a/plugins/AL_USDMaya/schemas/AL/usd/schemas/maya/CMakeLists.txt b/plugin/al/schemas/AL/usd/schemas/maya/CMakeLists.txt similarity index 100% rename from plugins/AL_USDMaya/schemas/AL/usd/schemas/maya/CMakeLists.txt rename to plugin/al/schemas/AL/usd/schemas/maya/CMakeLists.txt diff --git a/plugins/AL_USDMaya/schemas/AL/usd/schemas/maya/FrameRange.cpp b/plugin/al/schemas/AL/usd/schemas/maya/FrameRange.cpp similarity index 100% rename from plugins/AL_USDMaya/schemas/AL/usd/schemas/maya/FrameRange.cpp rename to plugin/al/schemas/AL/usd/schemas/maya/FrameRange.cpp diff --git a/plugins/AL_USDMaya/schemas/AL/usd/schemas/maya/FrameRange.h b/plugin/al/schemas/AL/usd/schemas/maya/FrameRange.h similarity index 100% rename from plugins/AL_USDMaya/schemas/AL/usd/schemas/maya/FrameRange.h rename to plugin/al/schemas/AL/usd/schemas/maya/FrameRange.h diff --git a/plugins/AL_USDMaya/schemas/AL/usd/schemas/maya/MayaReference.cpp b/plugin/al/schemas/AL/usd/schemas/maya/MayaReference.cpp similarity index 100% rename from plugins/AL_USDMaya/schemas/AL/usd/schemas/maya/MayaReference.cpp rename to plugin/al/schemas/AL/usd/schemas/maya/MayaReference.cpp diff --git a/plugins/AL_USDMaya/schemas/AL/usd/schemas/maya/MayaReference.h b/plugin/al/schemas/AL/usd/schemas/maya/MayaReference.h similarity index 100% rename from plugins/AL_USDMaya/schemas/AL/usd/schemas/maya/MayaReference.h rename to plugin/al/schemas/AL/usd/schemas/maya/MayaReference.h diff --git a/plugins/AL_USDMaya/schemas/AL/usd/schemas/maya/ModelAPI.cpp b/plugin/al/schemas/AL/usd/schemas/maya/ModelAPI.cpp similarity index 100% rename from plugins/AL_USDMaya/schemas/AL/usd/schemas/maya/ModelAPI.cpp rename to plugin/al/schemas/AL/usd/schemas/maya/ModelAPI.cpp diff --git a/plugins/AL_USDMaya/schemas/AL/usd/schemas/maya/ModelAPI.h b/plugin/al/schemas/AL/usd/schemas/maya/ModelAPI.h similarity index 100% rename from plugins/AL_USDMaya/schemas/AL/usd/schemas/maya/ModelAPI.h rename to plugin/al/schemas/AL/usd/schemas/maya/ModelAPI.h diff --git a/plugins/AL_USDMaya/schemas/AL/usd/schemas/maya/ModuleDeps.cpp b/plugin/al/schemas/AL/usd/schemas/maya/ModuleDeps.cpp similarity index 100% rename from plugins/AL_USDMaya/schemas/AL/usd/schemas/maya/ModuleDeps.cpp rename to plugin/al/schemas/AL/usd/schemas/maya/ModuleDeps.cpp diff --git a/plugins/AL_USDMaya/schemas/AL/usd/schemas/maya/__init__.py b/plugin/al/schemas/AL/usd/schemas/maya/__init__.py similarity index 100% rename from plugins/AL_USDMaya/schemas/AL/usd/schemas/maya/__init__.py rename to plugin/al/schemas/AL/usd/schemas/maya/__init__.py diff --git a/plugins/AL_USDMaya/schemas/AL/usd/schemas/maya/api.h b/plugin/al/schemas/AL/usd/schemas/maya/api.h similarity index 100% rename from plugins/AL_USDMaya/schemas/AL/usd/schemas/maya/api.h rename to plugin/al/schemas/AL/usd/schemas/maya/api.h diff --git a/plugins/AL_USDMaya/schemas/AL/usd/schemas/maya/generatedSchema.usda b/plugin/al/schemas/AL/usd/schemas/maya/generatedSchema.usda similarity index 100% rename from plugins/AL_USDMaya/schemas/AL/usd/schemas/maya/generatedSchema.usda rename to plugin/al/schemas/AL/usd/schemas/maya/generatedSchema.usda diff --git a/plugins/AL_USDMaya/schemas/AL/usd/schemas/maya/module.cpp b/plugin/al/schemas/AL/usd/schemas/maya/module.cpp similarity index 100% rename from plugins/AL_USDMaya/schemas/AL/usd/schemas/maya/module.cpp rename to plugin/al/schemas/AL/usd/schemas/maya/module.cpp diff --git a/plugins/AL_USDMaya/schemas/AL/usd/schemas/maya/plugInfo.json.in b/plugin/al/schemas/AL/usd/schemas/maya/plugInfo.json.in similarity index 100% rename from plugins/AL_USDMaya/schemas/AL/usd/schemas/maya/plugInfo.json.in rename to plugin/al/schemas/AL/usd/schemas/maya/plugInfo.json.in diff --git a/plugins/AL_USDMaya/schemas/AL/usd/schemas/maya/schema.usda.in b/plugin/al/schemas/AL/usd/schemas/maya/schema.usda.in similarity index 100% rename from plugins/AL_USDMaya/schemas/AL/usd/schemas/maya/schema.usda.in rename to plugin/al/schemas/AL/usd/schemas/maya/schema.usda.in diff --git a/plugins/AL_USDMaya/schemas/AL/usd/schemas/maya/tests/CMakeLists.txt b/plugin/al/schemas/AL/usd/schemas/maya/tests/CMakeLists.txt similarity index 100% rename from plugins/AL_USDMaya/schemas/AL/usd/schemas/maya/tests/CMakeLists.txt rename to plugin/al/schemas/AL/usd/schemas/maya/tests/CMakeLists.txt diff --git a/plugins/AL_USDMaya/schemas/AL/usd/schemas/maya/tests/RunTests.sh b/plugin/al/schemas/AL/usd/schemas/maya/tests/RunTests.sh similarity index 100% rename from plugins/AL_USDMaya/schemas/AL/usd/schemas/maya/tests/RunTests.sh rename to plugin/al/schemas/AL/usd/schemas/maya/tests/RunTests.sh diff --git a/plugins/AL_USDMaya/schemas/AL/usd/schemas/maya/tests/main.cpp b/plugin/al/schemas/AL/usd/schemas/maya/tests/main.cpp similarity index 100% rename from plugins/AL_USDMaya/schemas/AL/usd/schemas/maya/tests/main.cpp rename to plugin/al/schemas/AL/usd/schemas/maya/tests/main.cpp diff --git a/plugins/AL_USDMaya/schemas/AL/usd/schemas/maya/tests/testMayaSchemas.cpp b/plugin/al/schemas/AL/usd/schemas/maya/tests/testMayaSchemas.cpp similarity index 100% rename from plugins/AL_USDMaya/schemas/AL/usd/schemas/maya/tests/testMayaSchemas.cpp rename to plugin/al/schemas/AL/usd/schemas/maya/tests/testMayaSchemas.cpp diff --git a/plugins/AL_USDMaya/schemas/AL/usd/schemas/maya/tests/testModelAPI.cpp b/plugin/al/schemas/AL/usd/schemas/maya/tests/testModelAPI.cpp similarity index 100% rename from plugins/AL_USDMaya/schemas/AL/usd/schemas/maya/tests/testModelAPI.cpp rename to plugin/al/schemas/AL/usd/schemas/maya/tests/testModelAPI.cpp diff --git a/plugins/AL_USDMaya/schemas/AL/usd/schemas/maya/tokens.cpp b/plugin/al/schemas/AL/usd/schemas/maya/tokens.cpp similarity index 100% rename from plugins/AL_USDMaya/schemas/AL/usd/schemas/maya/tokens.cpp rename to plugin/al/schemas/AL/usd/schemas/maya/tokens.cpp diff --git a/plugins/AL_USDMaya/schemas/AL/usd/schemas/maya/tokens.h b/plugin/al/schemas/AL/usd/schemas/maya/tokens.h similarity index 100% rename from plugins/AL_USDMaya/schemas/AL/usd/schemas/maya/tokens.h rename to plugin/al/schemas/AL/usd/schemas/maya/tokens.h diff --git a/plugins/AL_USDMaya/schemas/AL/usd/schemas/maya/wrapFrameRange.cpp b/plugin/al/schemas/AL/usd/schemas/maya/wrapFrameRange.cpp similarity index 100% rename from plugins/AL_USDMaya/schemas/AL/usd/schemas/maya/wrapFrameRange.cpp rename to plugin/al/schemas/AL/usd/schemas/maya/wrapFrameRange.cpp diff --git a/plugins/AL_USDMaya/schemas/AL/usd/schemas/maya/wrapMayaReference.cpp b/plugin/al/schemas/AL/usd/schemas/maya/wrapMayaReference.cpp similarity index 100% rename from plugins/AL_USDMaya/schemas/AL/usd/schemas/maya/wrapMayaReference.cpp rename to plugin/al/schemas/AL/usd/schemas/maya/wrapMayaReference.cpp diff --git a/plugins/AL_USDMaya/schemas/AL/usd/schemas/maya/wrapModelAPI.cpp b/plugin/al/schemas/AL/usd/schemas/maya/wrapModelAPI.cpp similarity index 100% rename from plugins/AL_USDMaya/schemas/AL/usd/schemas/maya/wrapModelAPI.cpp rename to plugin/al/schemas/AL/usd/schemas/maya/wrapModelAPI.cpp diff --git a/plugins/AL_USDMaya/schemas/AL/usd/schemas/maya/wrapTokens.cpp b/plugin/al/schemas/AL/usd/schemas/maya/wrapTokens.cpp similarity index 100% rename from plugins/AL_USDMaya/schemas/AL/usd/schemas/maya/wrapTokens.cpp rename to plugin/al/schemas/AL/usd/schemas/maya/wrapTokens.cpp diff --git a/plugins/AL_USDMaya/schemas/CMakeLists.txt b/plugin/al/schemas/CMakeLists.txt similarity index 100% rename from plugins/AL_USDMaya/schemas/CMakeLists.txt rename to plugin/al/schemas/CMakeLists.txt diff --git a/plugins/AL_USDMaya/schemas/codegenTemplates/api.h b/plugin/al/schemas/codegenTemplates/api.h similarity index 100% rename from plugins/AL_USDMaya/schemas/codegenTemplates/api.h rename to plugin/al/schemas/codegenTemplates/api.h diff --git a/plugins/AL_USDMaya/schemas/codegenTemplates/plugInfo.json b/plugin/al/schemas/codegenTemplates/plugInfo.json similarity index 100% rename from plugins/AL_USDMaya/schemas/codegenTemplates/plugInfo.json rename to plugin/al/schemas/codegenTemplates/plugInfo.json diff --git a/plugins/AL_USDMaya/schemas/codegenTemplates/schemaClass.cpp b/plugin/al/schemas/codegenTemplates/schemaClass.cpp similarity index 100% rename from plugins/AL_USDMaya/schemas/codegenTemplates/schemaClass.cpp rename to plugin/al/schemas/codegenTemplates/schemaClass.cpp diff --git a/plugins/AL_USDMaya/schemas/codegenTemplates/schemaClass.h b/plugin/al/schemas/codegenTemplates/schemaClass.h similarity index 100% rename from plugins/AL_USDMaya/schemas/codegenTemplates/schemaClass.h rename to plugin/al/schemas/codegenTemplates/schemaClass.h diff --git a/plugins/AL_USDMaya/schemas/codegenTemplates/tokens.cpp b/plugin/al/schemas/codegenTemplates/tokens.cpp similarity index 100% rename from plugins/AL_USDMaya/schemas/codegenTemplates/tokens.cpp rename to plugin/al/schemas/codegenTemplates/tokens.cpp diff --git a/plugins/AL_USDMaya/schemas/codegenTemplates/tokens.h b/plugin/al/schemas/codegenTemplates/tokens.h similarity index 100% rename from plugins/AL_USDMaya/schemas/codegenTemplates/tokens.h rename to plugin/al/schemas/codegenTemplates/tokens.h diff --git a/plugins/AL_USDMaya/schemas/codegenTemplates/wrapSchemaClass.cpp b/plugin/al/schemas/codegenTemplates/wrapSchemaClass.cpp similarity index 100% rename from plugins/AL_USDMaya/schemas/codegenTemplates/wrapSchemaClass.cpp rename to plugin/al/schemas/codegenTemplates/wrapSchemaClass.cpp diff --git a/plugins/AL_USDMaya/schemas/codegenTemplates/wrapTokens.cpp b/plugin/al/schemas/codegenTemplates/wrapTokens.cpp similarity index 100% rename from plugins/AL_USDMaya/schemas/codegenTemplates/wrapTokens.cpp rename to plugin/al/schemas/codegenTemplates/wrapTokens.cpp diff --git a/plugins/AL_USDMaya/schemas/usd/schema.usda b/plugin/al/schemas/usd/schema.usda similarity index 100% rename from plugins/AL_USDMaya/schemas/usd/schema.usda rename to plugin/al/schemas/usd/schema.usda diff --git a/plugins/AL_USDMaya/translators/CMakeLists.txt b/plugin/al/translators/CMakeLists.txt similarity index 90% rename from plugins/AL_USDMaya/translators/CMakeLists.txt rename to plugin/al/translators/CMakeLists.txt index edb024f92c..208fa49f00 100644 --- a/plugins/AL_USDMaya/translators/CMakeLists.txt +++ b/plugin/al/translators/CMakeLists.txt @@ -71,17 +71,6 @@ set_target_properties(${TRANSLATORS_PACKAGE} "MFB_TRANSLATORS_PACKAGE=${TRANSLATORS_PACKAGE};MFB_ALT_TRANSLATORS_PACKAGE=${TRANSLATORS_PACKAGE}" ) -if (CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "APPLE") - set(rpath "$ORIGIN") - if(CMAKE_INSTALL_RPATH) - set(rpath "${CMAKE_INSTALL_RPATH}:${rpath}") - endif() - set_target_properties(${TRANSLATORS_PACKAGE} - PROPERTIES INSTALL_RPATH - "${rpath}" - ) -endif() - target_link_libraries(${TRANSLATORS_PACKAGE} ${DEPENDANT_LIBRARIES}) install(TARGETS ${TRANSLATORS_PACKAGE} diff --git a/plugins/AL_USDMaya/translators/Camera.cpp b/plugin/al/translators/Camera.cpp similarity index 99% rename from plugins/AL_USDMaya/translators/Camera.cpp rename to plugin/al/translators/Camera.cpp index f96c2a439d..bcf171b232 100644 --- a/plugins/AL_USDMaya/translators/Camera.cpp +++ b/plugin/al/translators/Camera.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/translators/Camera.h b/plugin/al/translators/Camera.h similarity index 99% rename from plugins/AL_USDMaya/translators/Camera.h rename to plugin/al/translators/Camera.h index c8189ef7d2..84558a9559 100644 --- a/plugins/AL_USDMaya/translators/Camera.h +++ b/plugin/al/translators/Camera.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/translators/DirectionalLight.cpp b/plugin/al/translators/DirectionalLight.cpp similarity index 99% rename from plugins/AL_USDMaya/translators/DirectionalLight.cpp rename to plugin/al/translators/DirectionalLight.cpp index 9117f7d399..d0d20213b0 100644 --- a/plugins/AL_USDMaya/translators/DirectionalLight.cpp +++ b/plugin/al/translators/DirectionalLight.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/translators/DirectionalLight.h b/plugin/al/translators/DirectionalLight.h similarity index 99% rename from plugins/AL_USDMaya/translators/DirectionalLight.h rename to plugin/al/translators/DirectionalLight.h index c429808d41..a6dcf87397 100644 --- a/plugins/AL_USDMaya/translators/DirectionalLight.h +++ b/plugin/al/translators/DirectionalLight.h @@ -2,7 +2,7 @@ // Copyright 2018 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/translators/FrameRange.cpp b/plugin/al/translators/FrameRange.cpp similarity index 100% rename from plugins/AL_USDMaya/translators/FrameRange.cpp rename to plugin/al/translators/FrameRange.cpp diff --git a/plugins/AL_USDMaya/translators/FrameRange.h b/plugin/al/translators/FrameRange.h similarity index 99% rename from plugins/AL_USDMaya/translators/FrameRange.h rename to plugin/al/translators/FrameRange.h index ef16b0bb79..3b90c82b19 100644 --- a/plugins/AL_USDMaya/translators/FrameRange.h +++ b/plugin/al/translators/FrameRange.h @@ -2,7 +2,7 @@ // Copyright 2018 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/translators/MayaReference.cpp b/plugin/al/translators/MayaReference.cpp similarity index 99% rename from plugins/AL_USDMaya/translators/MayaReference.cpp rename to plugin/al/translators/MayaReference.cpp index 9939227e18..7c7008da74 100644 --- a/plugins/AL_USDMaya/translators/MayaReference.cpp +++ b/plugin/al/translators/MayaReference.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/translators/MayaReference.h b/plugin/al/translators/MayaReference.h similarity index 99% rename from plugins/AL_USDMaya/translators/MayaReference.h rename to plugin/al/translators/MayaReference.h index fff2719ff9..a6ea0de08c 100644 --- a/plugins/AL_USDMaya/translators/MayaReference.h +++ b/plugin/al/translators/MayaReference.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/translators/Mesh.cpp b/plugin/al/translators/Mesh.cpp similarity index 100% rename from plugins/AL_USDMaya/translators/Mesh.cpp rename to plugin/al/translators/Mesh.cpp diff --git a/plugins/AL_USDMaya/translators/Mesh.h b/plugin/al/translators/Mesh.h similarity index 99% rename from plugins/AL_USDMaya/translators/Mesh.h rename to plugin/al/translators/Mesh.h index d48d42f3fa..294650d736 100644 --- a/plugins/AL_USDMaya/translators/Mesh.h +++ b/plugin/al/translators/Mesh.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/translators/NurbsCurve.cpp b/plugin/al/translators/NurbsCurve.cpp similarity index 99% rename from plugins/AL_USDMaya/translators/NurbsCurve.cpp rename to plugin/al/translators/NurbsCurve.cpp index e1e13f8356..4badf9b497 100644 --- a/plugins/AL_USDMaya/translators/NurbsCurve.cpp +++ b/plugin/al/translators/NurbsCurve.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/translators/NurbsCurve.h b/plugin/al/translators/NurbsCurve.h similarity index 99% rename from plugins/AL_USDMaya/translators/NurbsCurve.h rename to plugin/al/translators/NurbsCurve.h index bda3a7f314..81870ab99b 100644 --- a/plugins/AL_USDMaya/translators/NurbsCurve.h +++ b/plugin/al/translators/NurbsCurve.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/translators/README.md b/plugin/al/translators/README.md similarity index 100% rename from plugins/AL_USDMaya/translators/README.md rename to plugin/al/translators/README.md diff --git a/plugins/AL_USDMaya/translators/plugInfo.json.in b/plugin/al/translators/plugInfo.json.in similarity index 100% rename from plugins/AL_USDMaya/translators/plugInfo.json.in rename to plugin/al/translators/plugInfo.json.in diff --git a/plugins/AL_USDMaya/translators/pxrUsdTranslators/CMakeLists.txt b/plugin/al/translators/pxrUsdTranslators/CMakeLists.txt similarity index 86% rename from plugins/AL_USDMaya/translators/pxrUsdTranslators/CMakeLists.txt rename to plugin/al/translators/pxrUsdTranslators/CMakeLists.txt index 20fdc96964..ea0799a268 100644 --- a/plugins/AL_USDMaya/translators/pxrUsdTranslators/CMakeLists.txt +++ b/plugin/al/translators/pxrUsdTranslators/CMakeLists.txt @@ -33,20 +33,20 @@ add_library(${PXR_TRANSLATORS_PACKAGE} if(MSVC) set_target_properties(${PXR_TRANSLATORS_PACKAGE} PROPERTIES SUFFIX ".mll") elseif(APPLE) - set(CMAKE_MACOSX_RPATH ON) set_target_properties(${PXR_TRANSLATORS_PACKAGE} PROPERTIES PREFIX "" SUFFIX ".bundle" - BUILD_WITH_INSTALL_RPATH TRUE - INSTALL_RPATH "@loader_path/../lib;@loader_path/../../USD/lib;@loader_path/../../USD/third_party/maya/lib;${PXR_USD_LOCATION}/lib" + MACOSX_RPATH TRUE + INSTALL_RPATH_USE_LINK_PATH TRUE + INSTALL_RPATH "@loader_path/../lib;@loader_path/../../pxr/lib;@loader_path/../../pxr/maya/lib;${PXR_USD_LOCATION}/lib" ) else() set_target_properties(${PXR_TRANSLATORS_PACKAGE} PROPERTIES PREFIX "" - INSTALL_RPATH "$ORIGIN/../lib:$ORIGIN/../../USD/lib:$ORIGIN/../../USD/third_party/maya/lib:${PXR_USD_LOCATION}/lib:${PXR_USD_LOCATION}/lib64" - BUILD_WITH_INSTALL_RPATH TRUE + INSTALL_RPATH_USE_LINK_PATH TRUE + INSTALL_RPATH "$ORIGIN/../lib:$ORIGIN/../../pxr/lib:$ORIGIN/../../pxr/maya/lib:${PXR_USD_LOCATION}/lib:${PXR_USD_LOCATION}/lib64" ) endif() diff --git a/plugins/AL_USDMaya/translators/pxrUsdTranslators/ProxyShapeTranslator.cpp b/plugin/al/translators/pxrUsdTranslators/ProxyShapeTranslator.cpp similarity index 99% rename from plugins/AL_USDMaya/translators/pxrUsdTranslators/ProxyShapeTranslator.cpp rename to plugin/al/translators/pxrUsdTranslators/ProxyShapeTranslator.cpp index b0eabf90a0..4d9a2061f8 100644 --- a/plugins/AL_USDMaya/translators/pxrUsdTranslators/ProxyShapeTranslator.cpp +++ b/plugin/al/translators/pxrUsdTranslators/ProxyShapeTranslator.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/translators/pxrUsdTranslators/ProxyShapeTranslator.h b/plugin/al/translators/pxrUsdTranslators/ProxyShapeTranslator.h similarity index 99% rename from plugins/AL_USDMaya/translators/pxrUsdTranslators/ProxyShapeTranslator.h rename to plugin/al/translators/pxrUsdTranslators/ProxyShapeTranslator.h index 6eebc4e9da..abd1ffd009 100644 --- a/plugins/AL_USDMaya/translators/pxrUsdTranslators/ProxyShapeTranslator.h +++ b/plugin/al/translators/pxrUsdTranslators/ProxyShapeTranslator.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/translators/pxrUsdTranslators/plugInfo.json.in b/plugin/al/translators/pxrUsdTranslators/plugInfo.json.in similarity index 100% rename from plugins/AL_USDMaya/translators/pxrUsdTranslators/plugInfo.json.in rename to plugin/al/translators/pxrUsdTranslators/plugInfo.json.in diff --git a/plugins/AL_USDMaya/translators/pxrUsdTranslators/plugin.cpp b/plugin/al/translators/pxrUsdTranslators/plugin.cpp similarity index 99% rename from plugins/AL_USDMaya/translators/pxrUsdTranslators/plugin.cpp rename to plugin/al/translators/pxrUsdTranslators/plugin.cpp index 1553d9ca4f..2c48401e91 100644 --- a/plugins/AL_USDMaya/translators/pxrUsdTranslators/plugin.cpp +++ b/plugin/al/translators/pxrUsdTranslators/plugin.cpp @@ -2,7 +2,7 @@ // Copyright 2018 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/translators/pxrUsdTranslators/tests/CMakeLists.txt b/plugin/al/translators/pxrUsdTranslators/tests/CMakeLists.txt similarity index 100% rename from plugins/AL_USDMaya/translators/pxrUsdTranslators/tests/CMakeLists.txt rename to plugin/al/translators/pxrUsdTranslators/tests/CMakeLists.txt diff --git a/plugins/AL_USDMaya/translators/pxrUsdTranslators/tests/sphere2.usda b/plugin/al/translators/pxrUsdTranslators/tests/sphere2.usda similarity index 100% rename from plugins/AL_USDMaya/translators/pxrUsdTranslators/tests/sphere2.usda rename to plugin/al/translators/pxrUsdTranslators/tests/sphere2.usda diff --git a/plugins/AL_USDMaya/translators/pxrUsdTranslators/tests/testPxrTranslators.py b/plugin/al/translators/pxrUsdTranslators/tests/testPxrTranslators.py similarity index 100% rename from plugins/AL_USDMaya/translators/pxrUsdTranslators/tests/testPxrTranslators.py rename to plugin/al/translators/pxrUsdTranslators/tests/testPxrTranslators.py diff --git a/plugins/AL_USDMaya/translators/pxrUsdTranslators/tests/testPxrTranslators.sh b/plugin/al/translators/pxrUsdTranslators/tests/testPxrTranslators.sh similarity index 88% rename from plugins/AL_USDMaya/translators/pxrUsdTranslators/tests/testPxrTranslators.sh rename to plugin/al/translators/pxrUsdTranslators/tests/testPxrTranslators.sh index 7dc5cd8d9c..cc3c242f73 100755 --- a/plugins/AL_USDMaya/translators/pxrUsdTranslators/tests/testPxrTranslators.sh +++ b/plugin/al/translators/pxrUsdTranslators/tests/testPxrTranslators.sh @@ -2,7 +2,7 @@ export AL_USDMAYA_LOCATION=$1 export USD_LIBRARY_PATH=$2 -export MAYA_PLUG_IN_PATH=$AL_USDMAYA_LOCATION/plugin:$4/third_party/maya/plugin:$MAYA_PLUG_IN_PATH +export MAYA_PLUG_IN_PATH=$AL_USDMAYA_LOCATION/plugin:$4/maya/plugin:$MAYA_PLUG_IN_PATH export LD_LIBRARY_PATH=$AL_USDMAYA_LOCATION/lib:$USD_LIBRARY_PATH:$LD_LIBRARY_PATH export PYTHONPATH=$AL_USDMAYA_LOCATION/lib/python:$USD_LIBRARY_PATH/python:$3:$PYTHONPATH export PXR_PLUGINPATH_NAME=$AL_USDMAYA_LOCATION/plugin:$PXR_PLUGINPATH_NAME diff --git a/plugins/AL_USDMaya/translators/tests/CMakeLists.txt b/plugin/al/translators/tests/CMakeLists.txt similarity index 100% rename from plugins/AL_USDMaya/translators/tests/CMakeLists.txt rename to plugin/al/translators/tests/CMakeLists.txt diff --git a/plugins/AL_USDMaya/translators/tests/cube.ma b/plugin/al/translators/tests/cube.ma similarity index 100% rename from plugins/AL_USDMaya/translators/tests/cube.ma rename to plugin/al/translators/tests/cube.ma diff --git a/plugins/AL_USDMaya/translators/tests/sphere.usda b/plugin/al/translators/tests/sphere.usda similarity index 100% rename from plugins/AL_USDMaya/translators/tests/sphere.usda rename to plugin/al/translators/tests/sphere.usda diff --git a/plugins/AL_USDMaya/translators/tests/testDirectionalLight.usda b/plugin/al/translators/tests/testDirectionalLight.usda similarity index 100% rename from plugins/AL_USDMaya/translators/tests/testDirectionalLight.usda rename to plugin/al/translators/tests/testDirectionalLight.usda diff --git a/plugins/AL_USDMaya/translators/tests/testFrameRange.usda b/plugin/al/translators/tests/testFrameRange.usda similarity index 100% rename from plugins/AL_USDMaya/translators/tests/testFrameRange.usda rename to plugin/al/translators/tests/testFrameRange.usda diff --git a/plugins/AL_USDMaya/translators/tests/testFrameRangeCurrentFrame.usda b/plugin/al/translators/tests/testFrameRangeCurrentFrame.usda similarity index 100% rename from plugins/AL_USDMaya/translators/tests/testFrameRangeCurrentFrame.usda rename to plugin/al/translators/tests/testFrameRangeCurrentFrame.usda diff --git a/plugins/AL_USDMaya/translators/tests/testFrameRangeFallback.usda b/plugin/al/translators/tests/testFrameRangeFallback.usda similarity index 100% rename from plugins/AL_USDMaya/translators/tests/testFrameRangeFallback.usda rename to plugin/al/translators/tests/testFrameRangeFallback.usda diff --git a/plugins/AL_USDMaya/translators/tests/testFrameRangeNoImpact.usda b/plugin/al/translators/tests/testFrameRangeNoImpact.usda similarity index 100% rename from plugins/AL_USDMaya/translators/tests/testFrameRangeNoImpact.usda rename to plugin/al/translators/tests/testFrameRangeNoImpact.usda diff --git a/plugins/AL_USDMaya/translators/tests/testMayaRef.usda b/plugin/al/translators/tests/testMayaRef.usda similarity index 100% rename from plugins/AL_USDMaya/translators/tests/testMayaRef.usda rename to plugin/al/translators/tests/testMayaRef.usda diff --git a/plugins/AL_USDMaya/translators/tests/testMayaRefLoading.usda b/plugin/al/translators/tests/testMayaRefLoading.usda similarity index 100% rename from plugins/AL_USDMaya/translators/tests/testMayaRefLoading.usda rename to plugin/al/translators/tests/testMayaRefLoading.usda diff --git a/plugins/AL_USDMaya/translators/tests/testMayaRefUnloadable.usda b/plugin/al/translators/tests/testMayaRefUnloadable.usda similarity index 100% rename from plugins/AL_USDMaya/translators/tests/testMayaRefUnloadable.usda rename to plugin/al/translators/tests/testMayaRefUnloadable.usda diff --git a/plugins/AL_USDMaya/translators/tests/testMeshVariants.usda b/plugin/al/translators/tests/testMeshVariants.usda similarity index 100% rename from plugins/AL_USDMaya/translators/tests/testMeshVariants.usda rename to plugin/al/translators/tests/testMeshVariants.usda diff --git a/plugins/AL_USDMaya/translators/tests/testTranslatedPrimDisableClearIssue.usda b/plugin/al/translators/tests/testTranslatedPrimDisableClearIssue.usda similarity index 100% rename from plugins/AL_USDMaya/translators/tests/testTranslatedPrimDisableClearIssue.usda rename to plugin/al/translators/tests/testTranslatedPrimDisableClearIssue.usda diff --git a/plugins/AL_USDMaya/translators/tests/testTranslatedPrimDisableCrashIssue.usda b/plugin/al/translators/tests/testTranslatedPrimDisableCrashIssue.usda similarity index 100% rename from plugins/AL_USDMaya/translators/tests/testTranslatedPrimDisableCrashIssue.usda rename to plugin/al/translators/tests/testTranslatedPrimDisableCrashIssue.usda diff --git a/plugins/AL_USDMaya/translators/tests/testTranslators.py b/plugin/al/translators/tests/testTranslators.py similarity index 100% rename from plugins/AL_USDMaya/translators/tests/testTranslators.py rename to plugin/al/translators/tests/testTranslators.py diff --git a/plugins/AL_USDMaya/translators/tests/testTranslators.sh b/plugin/al/translators/tests/testTranslators.sh similarity index 100% rename from plugins/AL_USDMaya/translators/tests/testTranslators.sh rename to plugin/al/translators/tests/testTranslators.sh diff --git a/plugins/AL_USDMaya/translators/tests/translatortestutils.py b/plugin/al/translators/tests/translatortestutils.py similarity index 100% rename from plugins/AL_USDMaya/translators/tests/translatortestutils.py rename to plugin/al/translators/tests/translatortestutils.py diff --git a/plugins/AL_USDMaya/tutorials/endToEndMaya/.gitignore b/plugin/al/tutorials/endToEndMaya/.gitignore similarity index 100% rename from plugins/AL_USDMaya/tutorials/endToEndMaya/.gitignore rename to plugin/al/tutorials/endToEndMaya/.gitignore diff --git a/plugins/AL_USDMaya/tutorials/endToEndMaya/README.md b/plugin/al/tutorials/endToEndMaya/README.md similarity index 100% rename from plugins/AL_USDMaya/tutorials/endToEndMaya/README.md rename to plugin/al/tutorials/endToEndMaya/README.md diff --git a/plugins/AL_USDMaya/tutorials/endToEndMaya/USDMayaAnim.png b/plugin/al/tutorials/endToEndMaya/USDMayaAnim.png similarity index 100% rename from plugins/AL_USDMaya/tutorials/endToEndMaya/USDMayaAnim.png rename to plugin/al/tutorials/endToEndMaya/USDMayaAnim.png diff --git a/plugins/AL_USDMaya/tutorials/endToEndMaya/USDMayaScreenshotManip.png b/plugin/al/tutorials/endToEndMaya/USDMayaScreenshotManip.png similarity index 100% rename from plugins/AL_USDMaya/tutorials/endToEndMaya/USDMayaScreenshotManip.png rename to plugin/al/tutorials/endToEndMaya/USDMayaScreenshotManip.png diff --git a/plugins/AL_USDMaya/tutorials/endToEndMaya/assets/Ball/Ball.ma b/plugin/al/tutorials/endToEndMaya/assets/Ball/Ball.ma similarity index 100% rename from plugins/AL_USDMaya/tutorials/endToEndMaya/assets/Ball/Ball.ma rename to plugin/al/tutorials/endToEndMaya/assets/Ball/Ball.ma diff --git a/plugins/AL_USDMaya/tutorials/endToEndMaya/assets/Ball/Ball.maya.usd b/plugin/al/tutorials/endToEndMaya/assets/Ball/Ball.maya.usd similarity index 100% rename from plugins/AL_USDMaya/tutorials/endToEndMaya/assets/Ball/Ball.maya.usd rename to plugin/al/tutorials/endToEndMaya/assets/Ball/Ball.maya.usd diff --git a/plugins/AL_USDMaya/tutorials/endToEndMaya/assets/Ball/Ball.shadingVariants.usda b/plugin/al/tutorials/endToEndMaya/assets/Ball/Ball.shadingVariants.usda similarity index 100% rename from plugins/AL_USDMaya/tutorials/endToEndMaya/assets/Ball/Ball.shadingVariants.usda rename to plugin/al/tutorials/endToEndMaya/assets/Ball/Ball.shadingVariants.usda diff --git a/plugins/AL_USDMaya/tutorials/endToEndMaya/assets/Ball/Ball.usd b/plugin/al/tutorials/endToEndMaya/assets/Ball/Ball.usd similarity index 100% rename from plugins/AL_USDMaya/tutorials/endToEndMaya/assets/Ball/Ball.usd rename to plugin/al/tutorials/endToEndMaya/assets/Ball/Ball.usd diff --git a/plugins/AL_USDMaya/tutorials/endToEndMaya/assets/Ball/Ball_rig.ma b/plugin/al/tutorials/endToEndMaya/assets/Ball/Ball_rig.ma similarity index 100% rename from plugins/AL_USDMaya/tutorials/endToEndMaya/assets/Ball/Ball_rig.ma rename to plugin/al/tutorials/endToEndMaya/assets/Ball/Ball_rig.ma diff --git a/plugins/AL_USDMaya/tutorials/endToEndMaya/assets/Ball/tex/ball1.jpg b/plugin/al/tutorials/endToEndMaya/assets/Ball/tex/ball1.jpg similarity index 100% rename from plugins/AL_USDMaya/tutorials/endToEndMaya/assets/Ball/tex/ball1.jpg rename to plugin/al/tutorials/endToEndMaya/assets/Ball/tex/ball1.jpg diff --git a/plugins/AL_USDMaya/tutorials/endToEndMaya/assets/Ball/tex/ball1.tex b/plugin/al/tutorials/endToEndMaya/assets/Ball/tex/ball1.tex similarity index 100% rename from plugins/AL_USDMaya/tutorials/endToEndMaya/assets/Ball/tex/ball1.tex rename to plugin/al/tutorials/endToEndMaya/assets/Ball/tex/ball1.tex diff --git a/plugins/AL_USDMaya/tutorials/endToEndMaya/assets/Ball/tex/ball4.jpg b/plugin/al/tutorials/endToEndMaya/assets/Ball/tex/ball4.jpg similarity index 100% rename from plugins/AL_USDMaya/tutorials/endToEndMaya/assets/Ball/tex/ball4.jpg rename to plugin/al/tutorials/endToEndMaya/assets/Ball/tex/ball4.jpg diff --git a/plugins/AL_USDMaya/tutorials/endToEndMaya/assets/Ball/tex/ball4.tex b/plugin/al/tutorials/endToEndMaya/assets/Ball/tex/ball4.tex similarity index 100% rename from plugins/AL_USDMaya/tutorials/endToEndMaya/assets/Ball/tex/ball4.tex rename to plugin/al/tutorials/endToEndMaya/assets/Ball/tex/ball4.tex diff --git a/plugins/AL_USDMaya/tutorials/endToEndMaya/assets/Ball/tex/ball8.jpg b/plugin/al/tutorials/endToEndMaya/assets/Ball/tex/ball8.jpg similarity index 100% rename from plugins/AL_USDMaya/tutorials/endToEndMaya/assets/Ball/tex/ball8.jpg rename to plugin/al/tutorials/endToEndMaya/assets/Ball/tex/ball8.jpg diff --git a/plugins/AL_USDMaya/tutorials/endToEndMaya/assets/Ball/tex/ball8.tex b/plugin/al/tutorials/endToEndMaya/assets/Ball/tex/ball8.tex similarity index 100% rename from plugins/AL_USDMaya/tutorials/endToEndMaya/assets/Ball/tex/ball8.tex rename to plugin/al/tutorials/endToEndMaya/assets/Ball/tex/ball8.tex diff --git a/plugins/AL_USDMaya/tutorials/endToEndMaya/assets/Ball/tex/ball9.jpg b/plugin/al/tutorials/endToEndMaya/assets/Ball/tex/ball9.jpg similarity index 100% rename from plugins/AL_USDMaya/tutorials/endToEndMaya/assets/Ball/tex/ball9.jpg rename to plugin/al/tutorials/endToEndMaya/assets/Ball/tex/ball9.jpg diff --git a/plugins/AL_USDMaya/tutorials/endToEndMaya/assets/Ball/tex/ball9.tex b/plugin/al/tutorials/endToEndMaya/assets/Ball/tex/ball9.tex similarity index 100% rename from plugins/AL_USDMaya/tutorials/endToEndMaya/assets/Ball/tex/ball9.tex rename to plugin/al/tutorials/endToEndMaya/assets/Ball/tex/ball9.tex diff --git a/plugins/AL_USDMaya/tutorials/endToEndMaya/assets/Ball/tex/ballCue.jpg b/plugin/al/tutorials/endToEndMaya/assets/Ball/tex/ballCue.jpg similarity index 100% rename from plugins/AL_USDMaya/tutorials/endToEndMaya/assets/Ball/tex/ballCue.jpg rename to plugin/al/tutorials/endToEndMaya/assets/Ball/tex/ballCue.jpg diff --git a/plugins/AL_USDMaya/tutorials/endToEndMaya/assets/Ball/tex/ballCue.tex b/plugin/al/tutorials/endToEndMaya/assets/Ball/tex/ballCue.tex similarity index 100% rename from plugins/AL_USDMaya/tutorials/endToEndMaya/assets/Ball/tex/ballCue.tex rename to plugin/al/tutorials/endToEndMaya/assets/Ball/tex/ballCue.tex diff --git a/plugins/AL_USDMaya/tutorials/endToEndMaya/assets/Ball/tex/makeTex b/plugin/al/tutorials/endToEndMaya/assets/Ball/tex/makeTex similarity index 100% rename from plugins/AL_USDMaya/tutorials/endToEndMaya/assets/Ball/tex/makeTex rename to plugin/al/tutorials/endToEndMaya/assets/Ball/tex/makeTex diff --git a/plugins/AL_USDMaya/tutorials/endToEndMaya/assets/Table/Table.ma b/plugin/al/tutorials/endToEndMaya/assets/Table/Table.ma similarity index 100% rename from plugins/AL_USDMaya/tutorials/endToEndMaya/assets/Table/Table.ma rename to plugin/al/tutorials/endToEndMaya/assets/Table/Table.ma diff --git a/plugins/AL_USDMaya/tutorials/endToEndMaya/assets/Table/Table.maya.usd b/plugin/al/tutorials/endToEndMaya/assets/Table/Table.maya.usd similarity index 100% rename from plugins/AL_USDMaya/tutorials/endToEndMaya/assets/Table/Table.maya.usd rename to plugin/al/tutorials/endToEndMaya/assets/Table/Table.maya.usd diff --git a/plugins/AL_USDMaya/tutorials/endToEndMaya/assets/Table/Table.usd b/plugin/al/tutorials/endToEndMaya/assets/Table/Table.usd similarity index 100% rename from plugins/AL_USDMaya/tutorials/endToEndMaya/assets/Table/Table.usd rename to plugin/al/tutorials/endToEndMaya/assets/Table/Table.usd diff --git a/plugins/AL_USDMaya/tutorials/endToEndMaya/assets/main_cam.usd b/plugin/al/tutorials/endToEndMaya/assets/main_cam.usd similarity index 100% rename from plugins/AL_USDMaya/tutorials/endToEndMaya/assets/main_cam.usd rename to plugin/al/tutorials/endToEndMaya/assets/main_cam.usd diff --git a/plugins/AL_USDMaya/tutorials/endToEndMaya/assets/render.exr b/plugin/al/tutorials/endToEndMaya/assets/render.exr similarity index 100% rename from plugins/AL_USDMaya/tutorials/endToEndMaya/assets/render.exr rename to plugin/al/tutorials/endToEndMaya/assets/render.exr diff --git a/plugins/AL_USDMaya/tutorials/endToEndMaya/assets/shot.usd b/plugin/al/tutorials/endToEndMaya/assets/shot.usd similarity index 100% rename from plugins/AL_USDMaya/tutorials/endToEndMaya/assets/shot.usd rename to plugin/al/tutorials/endToEndMaya/assets/shot.usd diff --git a/plugins/AL_USDMaya/tutorials/endToEndMaya/assets/simple.katana b/plugin/al/tutorials/endToEndMaya/assets/simple.katana similarity index 100% rename from plugins/AL_USDMaya/tutorials/endToEndMaya/assets/simple.katana rename to plugin/al/tutorials/endToEndMaya/assets/simple.katana diff --git a/plugins/AL_USDMaya/tutorials/endToEndMaya/scripts/create_asset.py b/plugin/al/tutorials/endToEndMaya/scripts/create_asset.py similarity index 79% rename from plugins/AL_USDMaya/tutorials/endToEndMaya/scripts/create_asset.py rename to plugin/al/tutorials/endToEndMaya/scripts/create_asset.py index a1d0e13533..8b9399ff88 100644 --- a/plugins/AL_USDMaya/tutorials/endToEndMaya/scripts/create_asset.py +++ b/plugin/al/tutorials/endToEndMaya/scripts/create_asset.py @@ -2,25 +2,17 @@ # # Copyright 2016 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # ''' diff --git a/plugins/AL_USDMaya/tutorials/endToEndMaya/scripts/create_shot.py b/plugin/al/tutorials/endToEndMaya/scripts/create_shot.py similarity index 73% rename from plugins/AL_USDMaya/tutorials/endToEndMaya/scripts/create_shot.py rename to plugin/al/tutorials/endToEndMaya/scripts/create_shot.py index ef8171e5b1..5c43ea15f9 100644 --- a/plugins/AL_USDMaya/tutorials/endToEndMaya/scripts/create_shot.py +++ b/plugin/al/tutorials/endToEndMaya/scripts/create_shot.py @@ -2,25 +2,17 @@ # # Copyright 2016 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # ''' diff --git a/plugins/AL_USDMaya/tutorials/endToEndMaya/tutorial_scripts/add_set_to_s00.py b/plugin/al/tutorials/endToEndMaya/tutorial_scripts/add_set_to_s00.py similarity index 62% rename from plugins/AL_USDMaya/tutorials/endToEndMaya/tutorial_scripts/add_set_to_s00.py rename to plugin/al/tutorials/endToEndMaya/tutorial_scripts/add_set_to_s00.py index 5766e08a2e..4703808ca6 100644 --- a/plugins/AL_USDMaya/tutorials/endToEndMaya/tutorial_scripts/add_set_to_s00.py +++ b/plugin/al/tutorials/endToEndMaya/tutorial_scripts/add_set_to_s00.py @@ -2,25 +2,17 @@ # # Copyright 2016 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # import os diff --git a/plugins/AL_USDMaya/tutorials/endToEndMaya/tutorial_scripts/add_shadingVariants.py b/plugin/al/tutorials/endToEndMaya/tutorial_scripts/add_shadingVariants.py similarity index 81% rename from plugins/AL_USDMaya/tutorials/endToEndMaya/tutorial_scripts/add_shadingVariants.py rename to plugin/al/tutorials/endToEndMaya/tutorial_scripts/add_shadingVariants.py index 7ef58d3f4e..979f21c739 100644 --- a/plugins/AL_USDMaya/tutorials/endToEndMaya/tutorial_scripts/add_shadingVariants.py +++ b/plugin/al/tutorials/endToEndMaya/tutorial_scripts/add_shadingVariants.py @@ -2,25 +2,17 @@ # # Copyright 2016 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # ''' diff --git a/plugins/AL_USDMaya/tutorials/endToEndMaya/tutorial_scripts/create_Room_set.py b/plugin/al/tutorials/endToEndMaya/tutorial_scripts/create_Room_set.py similarity index 81% rename from plugins/AL_USDMaya/tutorials/endToEndMaya/tutorial_scripts/create_Room_set.py rename to plugin/al/tutorials/endToEndMaya/tutorial_scripts/create_Room_set.py index 78503221df..efe2ffb0f9 100644 --- a/plugins/AL_USDMaya/tutorials/endToEndMaya/tutorial_scripts/create_Room_set.py +++ b/plugin/al/tutorials/endToEndMaya/tutorial_scripts/create_Room_set.py @@ -2,25 +2,17 @@ # # Copyright 2016 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # ''' diff --git a/plugins/AL_USDMaya/tutorials/endToEndMaya/tutorial_scripts/prep_anim_shot_s00_01.py b/plugin/al/tutorials/endToEndMaya/tutorial_scripts/prep_anim_shot_s00_01.py similarity index 73% rename from plugins/AL_USDMaya/tutorials/endToEndMaya/tutorial_scripts/prep_anim_shot_s00_01.py rename to plugin/al/tutorials/endToEndMaya/tutorial_scripts/prep_anim_shot_s00_01.py index f6c41ca7de..2163ae48e4 100644 --- a/plugins/AL_USDMaya/tutorials/endToEndMaya/tutorial_scripts/prep_anim_shot_s00_01.py +++ b/plugin/al/tutorials/endToEndMaya/tutorial_scripts/prep_anim_shot_s00_01.py @@ -2,25 +2,17 @@ # # Copyright 2016 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # import os diff --git a/plugins/AL_USDMaya/tutorials/frameRanges/README.md b/plugin/al/tutorials/frameRanges/README.md similarity index 100% rename from plugins/AL_USDMaya/tutorials/frameRanges/README.md rename to plugin/al/tutorials/frameRanges/README.md diff --git a/plugins/AL_USDMaya/tutorials/frameRanges/assets/frame_range_prim.usda b/plugin/al/tutorials/frameRanges/assets/frame_range_prim.usda similarity index 100% rename from plugins/AL_USDMaya/tutorials/frameRanges/assets/frame_range_prim.usda rename to plugin/al/tutorials/frameRanges/assets/frame_range_prim.usda diff --git a/plugins/AL_USDMaya/tutorials/frameRanges/assets/frame_range_stage.usda b/plugin/al/tutorials/frameRanges/assets/frame_range_stage.usda similarity index 100% rename from plugins/AL_USDMaya/tutorials/frameRanges/assets/frame_range_stage.usda rename to plugin/al/tutorials/frameRanges/assets/frame_range_stage.usda diff --git a/plugins/AL_USDMaya/tutorials/lock/LockPrims.png b/plugin/al/tutorials/lock/LockPrims.png similarity index 100% rename from plugins/AL_USDMaya/tutorials/lock/LockPrims.png rename to plugin/al/tutorials/lock/LockPrims.png diff --git a/plugins/AL_USDMaya/tutorials/lock/README.md b/plugin/al/tutorials/lock/README.md similarity index 100% rename from plugins/AL_USDMaya/tutorials/lock/README.md rename to plugin/al/tutorials/lock/README.md diff --git a/plugins/AL_USDMaya/tutorials/lock/assets/lock_hierarchy.usda b/plugin/al/tutorials/lock/assets/lock_hierarchy.usda similarity index 100% rename from plugins/AL_USDMaya/tutorials/lock/assets/lock_hierarchy.usda rename to plugin/al/tutorials/lock/assets/lock_hierarchy.usda diff --git a/plugins/AL_USDMaya/tutorials/meshTranslation/README.md b/plugin/al/tutorials/meshTranslation/README.md similarity index 100% rename from plugins/AL_USDMaya/tutorials/meshTranslation/README.md rename to plugin/al/tutorials/meshTranslation/README.md diff --git a/plugins/AL_USDMaya/tutorials/meshTranslation/ScaledSphere.png b/plugin/al/tutorials/meshTranslation/ScaledSphere.png similarity index 100% rename from plugins/AL_USDMaya/tutorials/meshTranslation/ScaledSphere.png rename to plugin/al/tutorials/meshTranslation/ScaledSphere.png diff --git a/plugins/AL_USDMaya/tutorials/meshTranslation/Start.png b/plugin/al/tutorials/meshTranslation/Start.png similarity index 100% rename from plugins/AL_USDMaya/tutorials/meshTranslation/Start.png rename to plugin/al/tutorials/meshTranslation/Start.png diff --git a/plugins/AL_USDMaya/tutorials/meshTranslation/TranslatedPrim.png b/plugin/al/tutorials/meshTranslation/TranslatedPrim.png similarity index 100% rename from plugins/AL_USDMaya/tutorials/meshTranslation/TranslatedPrim.png rename to plugin/al/tutorials/meshTranslation/TranslatedPrim.png diff --git a/plugins/AL_USDMaya/tutorials/meshTranslation/primitive_world.usda b/plugin/al/tutorials/meshTranslation/primitive_world.usda similarity index 100% rename from plugins/AL_USDMaya/tutorials/meshTranslation/primitive_world.usda rename to plugin/al/tutorials/meshTranslation/primitive_world.usda diff --git a/plugins/AL_USDMaya/tutorials/selectability/AllSelectable.png b/plugin/al/tutorials/selectability/AllSelectable.png similarity index 100% rename from plugins/AL_USDMaya/tutorials/selectability/AllSelectable.png rename to plugin/al/tutorials/selectability/AllSelectable.png diff --git a/plugins/AL_USDMaya/tutorials/selectability/README.md b/plugin/al/tutorials/selectability/README.md similarity index 100% rename from plugins/AL_USDMaya/tutorials/selectability/README.md rename to plugin/al/tutorials/selectability/README.md diff --git a/plugins/AL_USDMaya/tutorials/selectability/SelectablePrims.png b/plugin/al/tutorials/selectability/SelectablePrims.png similarity index 100% rename from plugins/AL_USDMaya/tutorials/selectability/SelectablePrims.png rename to plugin/al/tutorials/selectability/SelectablePrims.png diff --git a/plugins/AL_USDMaya/tutorials/selectability/assets/cone.abc b/plugin/al/tutorials/selectability/assets/cone.abc similarity index 100% rename from plugins/AL_USDMaya/tutorials/selectability/assets/cone.abc rename to plugin/al/tutorials/selectability/assets/cone.abc diff --git a/plugins/AL_USDMaya/tutorials/selectability/assets/cube.abc b/plugin/al/tutorials/selectability/assets/cube.abc similarity index 100% rename from plugins/AL_USDMaya/tutorials/selectability/assets/cube.abc rename to plugin/al/tutorials/selectability/assets/cube.abc diff --git a/plugins/AL_USDMaya/tutorials/selectability/assets/cylinder.abc b/plugin/al/tutorials/selectability/assets/cylinder.abc similarity index 100% rename from plugins/AL_USDMaya/tutorials/selectability/assets/cylinder.abc rename to plugin/al/tutorials/selectability/assets/cylinder.abc diff --git a/plugins/AL_USDMaya/tutorials/selectability/assets/selectable_world.usda b/plugin/al/tutorials/selectability/assets/selectable_world.usda similarity index 100% rename from plugins/AL_USDMaya/tutorials/selectability/assets/selectable_world.usda rename to plugin/al/tutorials/selectability/assets/selectable_world.usda diff --git a/plugins/AL_USDMaya/tutorials/selectability/assets/sphere.abc b/plugin/al/tutorials/selectability/assets/sphere.abc similarity index 100% rename from plugins/AL_USDMaya/tutorials/selectability/assets/sphere.abc rename to plugin/al/tutorials/selectability/assets/sphere.abc diff --git a/plugins/AL_USDMaya/tutorials/tutorialAssets/cone.usda b/plugin/al/tutorials/tutorialAssets/cone.usda similarity index 100% rename from plugins/AL_USDMaya/tutorials/tutorialAssets/cone.usda rename to plugin/al/tutorials/tutorialAssets/cone.usda diff --git a/plugins/AL_USDMaya/tutorials/tutorialAssets/cube.usda b/plugin/al/tutorials/tutorialAssets/cube.usda similarity index 100% rename from plugins/AL_USDMaya/tutorials/tutorialAssets/cube.usda rename to plugin/al/tutorials/tutorialAssets/cube.usda diff --git a/plugins/AL_USDMaya/tutorials/tutorialAssets/cylinder.usda b/plugin/al/tutorials/tutorialAssets/cylinder.usda similarity index 100% rename from plugins/AL_USDMaya/tutorials/tutorialAssets/cylinder.usda rename to plugin/al/tutorials/tutorialAssets/cylinder.usda diff --git a/plugins/AL_USDMaya/tutorials/tutorialAssets/sphere.usda b/plugin/al/tutorials/tutorialAssets/sphere.usda similarity index 100% rename from plugins/AL_USDMaya/tutorials/tutorialAssets/sphere.usda rename to plugin/al/tutorials/tutorialAssets/sphere.usda diff --git a/plugins/AL_USDMaya/usdmayautils/AL/usdmaya/utils/Api.h b/plugin/al/usdmayautils/AL/usdmaya/utils/Api.h similarity index 99% rename from plugins/AL_USDMaya/usdmayautils/AL/usdmaya/utils/Api.h rename to plugin/al/usdmayautils/AL/usdmaya/utils/Api.h index ad294c3d6e..6f329d1a35 100644 --- a/plugins/AL_USDMaya/usdmayautils/AL/usdmaya/utils/Api.h +++ b/plugin/al/usdmayautils/AL/usdmaya/utils/Api.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/usdmayautils/AL/usdmaya/utils/AttributeType.cpp b/plugin/al/usdmayautils/AL/usdmaya/utils/AttributeType.cpp similarity index 99% rename from plugins/AL_USDMaya/usdmayautils/AL/usdmaya/utils/AttributeType.cpp rename to plugin/al/usdmayautils/AL/usdmaya/utils/AttributeType.cpp index 73cd3c229b..5da9428bd9 100644 --- a/plugins/AL_USDMaya/usdmayautils/AL/usdmaya/utils/AttributeType.cpp +++ b/plugin/al/usdmayautils/AL/usdmaya/utils/AttributeType.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/usdmayautils/AL/usdmaya/utils/AttributeType.h b/plugin/al/usdmayautils/AL/usdmaya/utils/AttributeType.h similarity index 99% rename from plugins/AL_USDMaya/usdmayautils/AL/usdmaya/utils/AttributeType.h rename to plugin/al/usdmayautils/AL/usdmaya/utils/AttributeType.h index 140d838f9d..024d69c82d 100644 --- a/plugins/AL_USDMaya/usdmayautils/AL/usdmaya/utils/AttributeType.h +++ b/plugin/al/usdmayautils/AL/usdmaya/utils/AttributeType.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/usdmayautils/AL/usdmaya/utils/CMakeLists.txt b/plugin/al/usdmayautils/AL/usdmaya/utils/CMakeLists.txt similarity index 100% rename from plugins/AL_USDMaya/usdmayautils/AL/usdmaya/utils/CMakeLists.txt rename to plugin/al/usdmayautils/AL/usdmaya/utils/CMakeLists.txt diff --git a/plugins/AL_USDMaya/usdmayautils/AL/usdmaya/utils/DgNodeHelper.cpp b/plugin/al/usdmayautils/AL/usdmaya/utils/DgNodeHelper.cpp similarity index 99% rename from plugins/AL_USDMaya/usdmayautils/AL/usdmaya/utils/DgNodeHelper.cpp rename to plugin/al/usdmayautils/AL/usdmaya/utils/DgNodeHelper.cpp index 15dda9df54..655d939520 100644 --- a/plugins/AL_USDMaya/usdmayautils/AL/usdmaya/utils/DgNodeHelper.cpp +++ b/plugin/al/usdmayautils/AL/usdmaya/utils/DgNodeHelper.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -38,6 +38,7 @@ #include "maya/MFnFloatArrayData.h" #include "maya/MFloatArray.h" +#include #include #include diff --git a/plugins/AL_USDMaya/usdmayautils/AL/usdmaya/utils/DgNodeHelper.h b/plugin/al/usdmayautils/AL/usdmaya/utils/DgNodeHelper.h similarity index 99% rename from plugins/AL_USDMaya/usdmayautils/AL/usdmaya/utils/DgNodeHelper.h rename to plugin/al/usdmayautils/AL/usdmaya/utils/DgNodeHelper.h index 1c17546496..9b60dc2086 100644 --- a/plugins/AL_USDMaya/usdmayautils/AL/usdmaya/utils/DgNodeHelper.h +++ b/plugin/al/usdmayautils/AL/usdmaya/utils/DgNodeHelper.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/usdmayautils/AL/usdmaya/utils/DiffPrimVar.cpp b/plugin/al/usdmayautils/AL/usdmaya/utils/DiffPrimVar.cpp similarity index 99% rename from plugins/AL_USDMaya/usdmayautils/AL/usdmaya/utils/DiffPrimVar.cpp rename to plugin/al/usdmayautils/AL/usdmaya/utils/DiffPrimVar.cpp index e17b697add..7a47a536df 100644 --- a/plugins/AL_USDMaya/usdmayautils/AL/usdmaya/utils/DiffPrimVar.cpp +++ b/plugin/al/usdmayautils/AL/usdmaya/utils/DiffPrimVar.cpp @@ -2,7 +2,7 @@ // Copyright 2018 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/usdmayautils/AL/usdmaya/utils/DiffPrimVar.h b/plugin/al/usdmayautils/AL/usdmaya/utils/DiffPrimVar.h similarity index 99% rename from plugins/AL_USDMaya/usdmayautils/AL/usdmaya/utils/DiffPrimVar.h rename to plugin/al/usdmayautils/AL/usdmaya/utils/DiffPrimVar.h index b636303e93..bd8f03c1ef 100644 --- a/plugins/AL_USDMaya/usdmayautils/AL/usdmaya/utils/DiffPrimVar.h +++ b/plugin/al/usdmayautils/AL/usdmaya/utils/DiffPrimVar.h @@ -2,7 +2,7 @@ // Copyright 2018 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/usdmayautils/AL/usdmaya/utils/ForwardDeclares.h b/plugin/al/usdmayautils/AL/usdmaya/utils/ForwardDeclares.h similarity index 100% rename from plugins/AL_USDMaya/usdmayautils/AL/usdmaya/utils/ForwardDeclares.h rename to plugin/al/usdmayautils/AL/usdmaya/utils/ForwardDeclares.h diff --git a/plugins/AL_USDMaya/usdmayautils/AL/usdmaya/utils/MeshUtils.cpp b/plugin/al/usdmayautils/AL/usdmaya/utils/MeshUtils.cpp similarity index 99% rename from plugins/AL_USDMaya/usdmayautils/AL/usdmaya/utils/MeshUtils.cpp rename to plugin/al/usdmayautils/AL/usdmaya/utils/MeshUtils.cpp index 57e159474c..21fc4298fb 100644 --- a/plugins/AL_USDMaya/usdmayautils/AL/usdmaya/utils/MeshUtils.cpp +++ b/plugin/al/usdmayautils/AL/usdmaya/utils/MeshUtils.cpp @@ -24,6 +24,8 @@ #include "maya/MItMeshPolygon.h" #include "maya/MGlobal.h" +#include + namespace AL { namespace usdmaya { namespace utils { diff --git a/plugins/AL_USDMaya/usdmayautils/AL/usdmaya/utils/MeshUtils.h b/plugin/al/usdmayautils/AL/usdmaya/utils/MeshUtils.h similarity index 100% rename from plugins/AL_USDMaya/usdmayautils/AL/usdmaya/utils/MeshUtils.h rename to plugin/al/usdmayautils/AL/usdmaya/utils/MeshUtils.h diff --git a/plugins/AL_USDMaya/usdmayautils/AL/usdmaya/utils/NurbsCurveUtils.cpp b/plugin/al/usdmayautils/AL/usdmaya/utils/NurbsCurveUtils.cpp similarity index 99% rename from plugins/AL_USDMaya/usdmayautils/AL/usdmaya/utils/NurbsCurveUtils.cpp rename to plugin/al/usdmayautils/AL/usdmaya/utils/NurbsCurveUtils.cpp index 80ae96e510..6e9054a7a7 100644 --- a/plugins/AL_USDMaya/usdmayautils/AL/usdmaya/utils/NurbsCurveUtils.cpp +++ b/plugin/al/usdmayautils/AL/usdmaya/utils/NurbsCurveUtils.cpp @@ -27,6 +27,8 @@ #include "maya/MPointArray.h" #include "maya/MGlobal.h" +#include + namespace AL { namespace usdmaya { namespace utils { diff --git a/plugins/AL_USDMaya/usdmayautils/AL/usdmaya/utils/NurbsCurveUtils.h b/plugin/al/usdmayautils/AL/usdmaya/utils/NurbsCurveUtils.h similarity index 100% rename from plugins/AL_USDMaya/usdmayautils/AL/usdmaya/utils/NurbsCurveUtils.h rename to plugin/al/usdmayautils/AL/usdmaya/utils/NurbsCurveUtils.h diff --git a/plugins/AL_USDMaya/usdmayautils/AL/usdmaya/utils/Utils.cpp b/plugin/al/usdmayautils/AL/usdmaya/utils/Utils.cpp similarity index 99% rename from plugins/AL_USDMaya/usdmayautils/AL/usdmaya/utils/Utils.cpp rename to plugin/al/usdmayautils/AL/usdmaya/utils/Utils.cpp index 63a1754a6a..463eebf924 100644 --- a/plugins/AL_USDMaya/usdmayautils/AL/usdmaya/utils/Utils.cpp +++ b/plugin/al/usdmayautils/AL/usdmaya/utils/Utils.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/usdmayautils/AL/usdmaya/utils/Utils.h b/plugin/al/usdmayautils/AL/usdmaya/utils/Utils.h similarity index 99% rename from plugins/AL_USDMaya/usdmayautils/AL/usdmaya/utils/Utils.h rename to plugin/al/usdmayautils/AL/usdmaya/utils/Utils.h index 0d11a9fc40..e62a9e7656 100644 --- a/plugins/AL_USDMaya/usdmayautils/AL/usdmaya/utils/Utils.h +++ b/plugin/al/usdmayautils/AL/usdmaya/utils/Utils.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/usdmayautils/CMakeLists.txt b/plugin/al/usdmayautils/CMakeLists.txt similarity index 100% rename from plugins/AL_USDMaya/usdmayautils/CMakeLists.txt rename to plugin/al/usdmayautils/CMakeLists.txt diff --git a/plugins/AL_USDMaya/usdutils/AL/usd/utils/ALHalf.h b/plugin/al/usdutils/AL/usd/utils/ALHalf.h similarity index 99% rename from plugins/AL_USDMaya/usdutils/AL/usd/utils/ALHalf.h rename to plugin/al/usdutils/AL/usd/utils/ALHalf.h index 48b16aa61d..28e3559a0d 100644 --- a/plugins/AL_USDMaya/usdutils/AL/usd/utils/ALHalf.h +++ b/plugin/al/usdutils/AL/usd/utils/ALHalf.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/usdutils/AL/usd/utils/Api.h b/plugin/al/usdutils/AL/usd/utils/Api.h similarity index 99% rename from plugins/AL_USDMaya/usdutils/AL/usd/utils/Api.h rename to plugin/al/usdutils/AL/usd/utils/Api.h index 11df1c1ce8..d754497c47 100644 --- a/plugins/AL_USDMaya/usdutils/AL/usd/utils/Api.h +++ b/plugin/al/usdutils/AL/usd/utils/Api.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/usdutils/AL/usd/utils/CMakeLists.txt b/plugin/al/usdutils/AL/usd/utils/CMakeLists.txt similarity index 100% rename from plugins/AL_USDMaya/usdutils/AL/usd/utils/CMakeLists.txt rename to plugin/al/usdutils/AL/usd/utils/CMakeLists.txt diff --git a/plugins/AL_USDMaya/usdutils/AL/usd/utils/DebugCodes.cpp b/plugin/al/usdutils/AL/usd/utils/DebugCodes.cpp similarity index 99% rename from plugins/AL_USDMaya/usdutils/AL/usd/utils/DebugCodes.cpp rename to plugin/al/usdutils/AL/usd/utils/DebugCodes.cpp index 91816fb0cf..99e32b0e34 100644 --- a/plugins/AL_USDMaya/usdutils/AL/usd/utils/DebugCodes.cpp +++ b/plugin/al/usdutils/AL/usd/utils/DebugCodes.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/usdutils/AL/usd/utils/DebugCodes.h b/plugin/al/usdutils/AL/usd/utils/DebugCodes.h similarity index 99% rename from plugins/AL_USDMaya/usdutils/AL/usd/utils/DebugCodes.h rename to plugin/al/usdutils/AL/usd/utils/DebugCodes.h index 223295414f..de53a47585 100644 --- a/plugins/AL_USDMaya/usdutils/AL/usd/utils/DebugCodes.h +++ b/plugin/al/usdutils/AL/usd/utils/DebugCodes.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/usdutils/AL/usd/utils/DiffCore.cpp b/plugin/al/usdutils/AL/usd/utils/DiffCore.cpp similarity index 99% rename from plugins/AL_USDMaya/usdutils/AL/usd/utils/DiffCore.cpp rename to plugin/al/usdutils/AL/usd/utils/DiffCore.cpp index ab64083b4f..26501cd06a 100644 --- a/plugins/AL_USDMaya/usdutils/AL/usd/utils/DiffCore.cpp +++ b/plugin/al/usdutils/AL/usd/utils/DiffCore.cpp @@ -2,7 +2,7 @@ // Copyright 2018 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/usdutils/AL/usd/utils/DiffCore.h b/plugin/al/usdutils/AL/usd/utils/DiffCore.h similarity index 99% rename from plugins/AL_USDMaya/usdutils/AL/usd/utils/DiffCore.h rename to plugin/al/usdutils/AL/usd/utils/DiffCore.h index 9a3220b37f..13a30d72fd 100644 --- a/plugins/AL_USDMaya/usdutils/AL/usd/utils/DiffCore.h +++ b/plugin/al/usdutils/AL/usd/utils/DiffCore.h @@ -2,7 +2,7 @@ // Copyright 2018 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/usdutils/AL/usd/utils/ForwardDeclares.h b/plugin/al/usdutils/AL/usd/utils/ForwardDeclares.h similarity index 99% rename from plugins/AL_USDMaya/usdutils/AL/usd/utils/ForwardDeclares.h rename to plugin/al/usdutils/AL/usd/utils/ForwardDeclares.h index 184f63b760..43d7334ded 100644 --- a/plugins/AL_USDMaya/usdutils/AL/usd/utils/ForwardDeclares.h +++ b/plugin/al/usdutils/AL/usd/utils/ForwardDeclares.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/usdutils/AL/usd/utils/SIMD.h b/plugin/al/usdutils/AL/usd/utils/SIMD.h similarity index 99% rename from plugins/AL_USDMaya/usdutils/AL/usd/utils/SIMD.h rename to plugin/al/usdutils/AL/usd/utils/SIMD.h index d660dabe88..d34b85f205 100644 --- a/plugins/AL_USDMaya/usdutils/AL/usd/utils/SIMD.h +++ b/plugin/al/usdutils/AL/usd/utils/SIMD.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/usdutils/CMakeLists.txt b/plugin/al/usdutils/CMakeLists.txt similarity index 100% rename from plugins/AL_USDMaya/usdutils/CMakeLists.txt rename to plugin/al/usdutils/CMakeLists.txt diff --git a/plugins/AL_USDMaya/utils/AL/CMakeLists.txt b/plugin/al/utils/AL/CMakeLists.txt similarity index 100% rename from plugins/AL_USDMaya/utils/AL/CMakeLists.txt rename to plugin/al/utils/AL/CMakeLists.txt diff --git a/plugins/AL_USDMaya/utils/AL/event/Api.h b/plugin/al/utils/AL/event/Api.h similarity index 99% rename from plugins/AL_USDMaya/utils/AL/event/Api.h rename to plugin/al/utils/AL/event/Api.h index cc027a306b..4e85b6588f 100644 --- a/plugins/AL_USDMaya/utils/AL/event/Api.h +++ b/plugin/al/utils/AL/event/Api.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/utils/AL/event/CMakeLists.txt b/plugin/al/utils/AL/event/CMakeLists.txt similarity index 100% rename from plugins/AL_USDMaya/utils/AL/event/CMakeLists.txt rename to plugin/al/utils/AL/event/CMakeLists.txt diff --git a/plugins/AL_USDMaya/utils/AL/event/EventHandler.cpp b/plugin/al/utils/AL/event/EventHandler.cpp similarity index 99% rename from plugins/AL_USDMaya/utils/AL/event/EventHandler.cpp rename to plugin/al/utils/AL/event/EventHandler.cpp index 1338981541..0ec4eb5956 100644 --- a/plugins/AL_USDMaya/utils/AL/event/EventHandler.cpp +++ b/plugin/al/utils/AL/event/EventHandler.cpp @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/utils/AL/event/EventHandler.h b/plugin/al/utils/AL/event/EventHandler.h similarity index 99% rename from plugins/AL_USDMaya/utils/AL/event/EventHandler.h rename to plugin/al/utils/AL/event/EventHandler.h index d89f8a3a8b..9eb734144d 100644 --- a/plugins/AL_USDMaya/utils/AL/event/EventHandler.h +++ b/plugin/al/utils/AL/event/EventHandler.h @@ -2,7 +2,7 @@ // Copyright 2017 Animal Logic // // Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License.// +// you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 diff --git a/plugins/AL_USDMaya/utils/CMakeLists.txt b/plugin/al/utils/CMakeLists.txt similarity index 100% rename from plugins/AL_USDMaya/utils/CMakeLists.txt rename to plugin/al/utils/CMakeLists.txt diff --git a/plugins/PXR_USDMaya/CMakeLists.txt b/plugin/pxr/CMakeLists.txt similarity index 90% rename from plugins/PXR_USDMaya/CMakeLists.txt rename to plugin/pxr/CMakeLists.txt index 460febb734..0af825e8ad 100644 --- a/plugins/PXR_USDMaya/CMakeLists.txt +++ b/plugin/pxr/CMakeLists.txt @@ -3,6 +3,8 @@ message("========== Pixar USD Plugin ==========") #============================================================================== # Modules and Definitions #============================================================================== +set(INSTALL_DIR_SUFFIX plugin/pxr) + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake/modules ${CMAKE_CURRENT_SOURCE_DIR}/cmake/macros @@ -21,8 +23,6 @@ find_package(Maya REQUIRED) find_package(USD REQUIRED) include(${USD_CONFIG_FILE}) -# find_package(MayaCoreUSD REQUIRED) - pxr_toplevel_prologue() - add_subdirectory(third_party/maya) + add_subdirectory(maya) pxr_toplevel_epilogue() diff --git a/plugins/PXR_USDMaya/LICENSE.txt b/plugin/pxr/LICENSE.txt similarity index 100% rename from plugins/PXR_USDMaya/LICENSE.txt rename to plugin/pxr/LICENSE.txt diff --git a/plugins/PXR_USDMaya/cmake/macros/Private.cmake b/plugin/pxr/cmake/macros/Private.cmake similarity index 99% rename from plugins/PXR_USDMaya/cmake/macros/Private.cmake rename to plugin/pxr/cmake/macros/Private.cmake index 77aa29b77e..3019d0c6b4 100644 --- a/plugins/PXR_USDMaya/cmake/macros/Private.cmake +++ b/plugin/pxr/cmake/macros/Private.cmake @@ -23,8 +23,6 @@ # include(Version) -set(INSTALL_DIR_SUFFIX USD) - # Copy headers to the build tree. In the source tree we find headers in # paths like pxr/base/lib/tf but we #include using paths like pxr/base/tf, # i.e. without 'lib/'. So we copy the headers (public and private) into @@ -52,7 +50,7 @@ function(_copy_headers LIBRARY_NAME) add_custom_command( OUTPUT ${outfile} COMMAND ${CMAKE_COMMAND} -E make_directory "${dir_to_create}" - COMMAND ${CMAKE_COMMAND} -Dinfile="${infile}" -Doutfile="${outfile}" -P "${PROJECT_SOURCE_DIR}/plugins/PXR_USDMaya/cmake/macros/copyHeaderForBuild.cmake" + COMMAND ${CMAKE_COMMAND} -Dinfile="${infile}" -Doutfile="${outfile}" -P "${PROJECT_SOURCE_DIR}/plugin/pxr/cmake/macros/copyHeaderForBuild.cmake" MAIN_DEPENDENCY "${infile}" COMMENT "Copying ${f} ..." VERBATIM @@ -151,7 +149,7 @@ function(_install_python LIBRARY_NAME) add_custom_command(OUTPUT ${outfile} COMMAND ${PYTHON_EXECUTABLE} - ${PROJECT_SOURCE_DIR}/plugins/PXR_USDMaya/cmake/macros/compilePython.py + ${PROJECT_SOURCE_DIR}/plugin/pxr/cmake/macros/compilePython.py ${CMAKE_CURRENT_SOURCE_DIR}/${file} ${CMAKE_CURRENT_SOURCE_DIR}/${file} ${CMAKE_CURRENT_BINARY_DIR}/${file_we}.pyc diff --git a/plugins/PXR_USDMaya/cmake/macros/Public.cmake b/plugin/pxr/cmake/macros/Public.cmake similarity index 100% rename from plugins/PXR_USDMaya/cmake/macros/Public.cmake rename to plugin/pxr/cmake/macros/Public.cmake diff --git a/plugins/PXR_USDMaya/cmake/macros/compilePython.py b/plugin/pxr/cmake/macros/compilePython.py similarity index 65% rename from plugins/PXR_USDMaya/cmake/macros/compilePython.py rename to plugin/pxr/cmake/macros/compilePython.py index 58ab77ca27..35b2a8d368 100755 --- a/plugins/PXR_USDMaya/cmake/macros/compilePython.py +++ b/plugin/pxr/cmake/macros/compilePython.py @@ -1,25 +1,17 @@ # # Copyright 2016 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # # # Usage: compilePython source.py dest.pyc diff --git a/plugins/PXR_USDMaya/cmake/macros/copyHeaderForBuild.cmake b/plugin/pxr/cmake/macros/copyHeaderForBuild.cmake similarity index 100% rename from plugins/PXR_USDMaya/cmake/macros/copyHeaderForBuild.cmake rename to plugin/pxr/cmake/macros/copyHeaderForBuild.cmake diff --git a/plugins/PXR_USDMaya/cmake/macros/shebang.py b/plugin/pxr/cmake/macros/shebang.py similarity index 53% rename from plugins/PXR_USDMaya/cmake/macros/shebang.py rename to plugin/pxr/cmake/macros/shebang.py index 537ffac564..8281578399 100644 --- a/plugins/PXR_USDMaya/cmake/macros/shebang.py +++ b/plugin/pxr/cmake/macros/shebang.py @@ -1,25 +1,17 @@ # # Copyright 2017 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # # # Usage: diff --git a/plugins/PXR_USDMaya/cmake/macros/testWrapper.py b/plugin/pxr/cmake/macros/testWrapper.py similarity index 92% rename from plugins/PXR_USDMaya/cmake/macros/testWrapper.py rename to plugin/pxr/cmake/macros/testWrapper.py index be0f552cbc..2c611f392b 100644 --- a/plugins/PXR_USDMaya/cmake/macros/testWrapper.py +++ b/plugin/pxr/cmake/macros/testWrapper.py @@ -1,25 +1,17 @@ # # Copyright 2016 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # # # Usage: testWrapper.py diff --git a/plugins/PXR_USDMaya/third_party/maya/CMakeLists.txt b/plugin/pxr/maya/CMakeLists.txt similarity index 63% rename from plugins/PXR_USDMaya/third_party/maya/CMakeLists.txt rename to plugin/pxr/maya/CMakeLists.txt index dd56409813..0834a07c9b 100644 --- a/plugins/PXR_USDMaya/third_party/maya/CMakeLists.txt +++ b/plugin/pxr/maya/CMakeLists.txt @@ -1,5 +1,5 @@ -set(PXR_INSTALL_SUBDIR "third_party/maya") - +set(PXR_INSTALL_SUBDIR "maya") + pxr_add_extra_plugins(plugin) add_subdirectory(lib) diff --git a/plugins/PXR_USDMaya/third_party/maya/README.md b/plugin/pxr/maya/README.md similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/README.md rename to plugin/pxr/maya/README.md diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/CMakeLists.txt b/plugin/pxr/maya/lib/CMakeLists.txt similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/CMakeLists.txt rename to plugin/pxr/maya/lib/CMakeLists.txt diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/px_vp20/CMakeLists.txt b/plugin/pxr/maya/lib/px_vp20/CMakeLists.txt similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/px_vp20/CMakeLists.txt rename to plugin/pxr/maya/lib/px_vp20/CMakeLists.txt diff --git a/plugin/pxr/maya/lib/px_vp20/api.h b/plugin/pxr/maya/lib/px_vp20/api.h new file mode 100644 index 0000000000..48fa79ef65 --- /dev/null +++ b/plugin/pxr/maya/lib/px_vp20/api.h @@ -0,0 +1,32 @@ +// +// Copyright 2017 Pixar +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +#ifndef PX_VP20_API_H +#define PX_VP20_API_H + +#include "pxr/base/arch/export.h" + +#if defined(PX_VP20_EXPORTS) +# define PX_VP20_API ARCH_EXPORT +# define PX_VP20_API_TEMPLATE_CLASS(...) ARCH_EXPORT_TEMPLATE(class, __VA_ARGS__) +# define PX_VP20_API_TEMPLATE_STRUCT(...) ARCH_EXPORT_TEMPLATE(struct, __VA_ARGS__) +#else +# define PX_VP20_API ARCH_IMPORT +# define PX_VP20_API_TEMPLATE_CLASS(...) ARCH_IMPORT_TEMPLATE(class, __VA_ARGS__) +# define PX_VP20_API_TEMPLATE_STRUCT(...) ARCH_IMPORT_TEMPLATE(struct, __VA_ARGS__) +#endif +#define PX_VP20_LOCAL ARCH_HIDDEN + +#endif diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/px_vp20/glslProgram.cpp b/plugin/pxr/maya/lib/px_vp20/glslProgram.cpp similarity index 83% rename from plugins/PXR_USDMaya/third_party/maya/lib/px_vp20/glslProgram.cpp rename to plugin/pxr/maya/lib/px_vp20/glslProgram.cpp index e04c209f73..a46de8fa43 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/px_vp20/glslProgram.cpp +++ b/plugin/pxr/maya/lib/px_vp20/glslProgram.cpp @@ -1,25 +1,17 @@ // // Copyright 2017 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // // glew must be included before any other GL header. diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/px_vp20/glslProgram.h b/plugin/pxr/maya/lib/px_vp20/glslProgram.h similarity index 58% rename from plugins/PXR_USDMaya/third_party/maya/lib/px_vp20/glslProgram.h rename to plugin/pxr/maya/lib/px_vp20/glslProgram.h index 9b9b8e19f0..f621270e61 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/px_vp20/glslProgram.h +++ b/plugin/pxr/maya/lib/px_vp20/glslProgram.h @@ -1,25 +1,17 @@ // // Copyright 2017 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // /// \file glslProgram.h diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/px_vp20/utils.cpp b/plugin/pxr/maya/lib/px_vp20/utils.cpp similarity index 97% rename from plugins/PXR_USDMaya/third_party/maya/lib/px_vp20/utils.cpp rename to plugin/pxr/maya/lib/px_vp20/utils.cpp index b130a54b99..fbf9749b61 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/px_vp20/utils.cpp +++ b/plugin/pxr/maya/lib/px_vp20/utils.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // // glew must be included before any other GL header. #include "pxr/imaging/glf/glew.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/px_vp20/utils.h b/plugin/pxr/maya/lib/px_vp20/utils.h similarity index 80% rename from plugins/PXR_USDMaya/third_party/maya/lib/px_vp20/utils.h rename to plugin/pxr/maya/lib/px_vp20/utils.h index 27c8b55bab..51dcf6b792 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/px_vp20/utils.h +++ b/plugin/pxr/maya/lib/px_vp20/utils.h @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXVP20_UTILS_H #define PXVP20_UTILS_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/px_vp20/utils_legacy.cpp b/plugin/pxr/maya/lib/px_vp20/utils_legacy.cpp similarity index 70% rename from plugins/PXR_USDMaya/third_party/maya/lib/px_vp20/utils_legacy.cpp rename to plugin/pxr/maya/lib/px_vp20/utils_legacy.cpp index 3b1ed9f833..74d07000fe 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/px_vp20/utils_legacy.cpp +++ b/plugin/pxr/maya/lib/px_vp20/utils_legacy.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxr/pxr.h" #include "px_vp20/utils_legacy.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/px_vp20/utils_legacy.h b/plugin/pxr/maya/lib/px_vp20/utils_legacy.h similarity index 53% rename from plugins/PXR_USDMaya/third_party/maya/lib/px_vp20/utils_legacy.h rename to plugin/pxr/maya/lib/px_vp20/utils_legacy.h index fa82d29016..1363404503 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/px_vp20/utils_legacy.h +++ b/plugin/pxr/maya/lib/px_vp20/utils_legacy.h @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXVP20_UTILS_LEGACY_H #define PXVP20_UTILS_LEGACY_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/CMakeLists.txt b/plugin/pxr/maya/lib/pxrUsdMayaGL/CMakeLists.txt similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/CMakeLists.txt rename to plugin/pxr/maya/lib/pxrUsdMayaGL/CMakeLists.txt diff --git a/plugin/pxr/maya/lib/pxrUsdMayaGL/api.h b/plugin/pxr/maya/lib/pxrUsdMayaGL/api.h new file mode 100644 index 0000000000..40856405f8 --- /dev/null +++ b/plugin/pxr/maya/lib/pxrUsdMayaGL/api.h @@ -0,0 +1,32 @@ +// +// Copyright 2017 Pixar +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +#ifndef PXRUSDMAYAGL_API_H +#define PXRUSDMAYAGL_API_H + +#include "pxr/base/arch/export.h" + +#if defined(PXRUSDMAYAGL_EXPORTS) +# define PXRUSDMAYAGL_API ARCH_EXPORT +# define PXRUSDMAYAGL_API_TEMPLATE_CLASS(...) ARCH_EXPORT_TEMPLATE(class, __VA_ARGS__) +# define PXRUSDMAYAGL_API_TEMPLATE_STRUCT(...) ARCH_EXPORT_TEMPLATE(struct, __VA_ARGS__) +#else +# define PXRUSDMAYAGL_API ARCH_IMPORT +# define PXRUSDMAYAGL_API_TEMPLATE_CLASS(...) ARCH_IMPORT_TEMPLATE(class, __VA_ARGS__) +# define PXRUSDMAYAGL_API_TEMPLATE_STRUCT(...) ARCH_IMPORT_TEMPLATE(struct, __VA_ARGS__) +#endif +#define PXRUSDMAYAGL_LOCAL ARCH_HIDDEN + +#endif diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/batchRenderer.cpp b/plugin/pxr/maya/lib/pxrUsdMayaGL/batchRenderer.cpp similarity index 98% rename from plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/batchRenderer.cpp rename to plugin/pxr/maya/lib/pxrUsdMayaGL/batchRenderer.cpp index 9e2f704faf..018662f20e 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/batchRenderer.cpp +++ b/plugin/pxr/maya/lib/pxrUsdMayaGL/batchRenderer.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // // glew needs to be included before any other OpenGL headers. diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/batchRenderer.h b/plugin/pxr/maya/lib/pxrUsdMayaGL/batchRenderer.h similarity index 95% rename from plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/batchRenderer.h rename to plugin/pxr/maya/lib/pxrUsdMayaGL/batchRenderer.h index 20273e5d12..f9bfd5adeb 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/batchRenderer.h +++ b/plugin/pxr/maya/lib/pxrUsdMayaGL/batchRenderer.h @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYAGL_BATCH_RENDERER_H #define PXRUSDMAYAGL_BATCH_RENDERER_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/debugCodes.cpp b/plugin/pxr/maya/lib/pxrUsdMayaGL/debugCodes.cpp similarity index 55% rename from plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/debugCodes.cpp rename to plugin/pxr/maya/lib/pxrUsdMayaGL/debugCodes.cpp index cba97b2c51..4a7b671593 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/debugCodes.cpp +++ b/plugin/pxr/maya/lib/pxrUsdMayaGL/debugCodes.cpp @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxrUsdMayaGL/debugCodes.h" diff --git a/plugin/pxr/maya/lib/pxrUsdMayaGL/debugCodes.h b/plugin/pxr/maya/lib/pxrUsdMayaGL/debugCodes.h new file mode 100644 index 0000000000..7456baf4b8 --- /dev/null +++ b/plugin/pxr/maya/lib/pxrUsdMayaGL/debugCodes.h @@ -0,0 +1,40 @@ +// +// Copyright 2018 Pixar +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +#ifndef PXRUSDMAYAGL_DEBUG_CODES +#define PXRUSDMAYAGL_DEBUG_CODES + +/// \file pxrUsdMayaGL/debugCodes.h + +#include "pxr/pxr.h" +#include "pxr/base/tf/debug.h" + + +PXR_NAMESPACE_OPEN_SCOPE + + +TF_DEBUG_CODES( + PXRUSDMAYAGL_BATCHED_DRAWING, + PXRUSDMAYAGL_BATCHED_SELECTION, + PXRUSDMAYAGL_INSTANCER_TRACKING, + PXRUSDMAYAGL_SHAPE_ADAPTER_BUCKETING, + PXRUSDMAYAGL_SHAPE_ADAPTER_LIFECYCLE +); + + +PXR_NAMESPACE_CLOSE_SCOPE + + +#endif diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/hdImagingShapeDrawOverride.cpp b/plugin/pxr/maya/lib/pxrUsdMayaGL/hdImagingShapeDrawOverride.cpp similarity index 82% rename from plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/hdImagingShapeDrawOverride.cpp rename to plugin/pxr/maya/lib/pxrUsdMayaGL/hdImagingShapeDrawOverride.cpp index d8011b6f40..af8aa9f5a5 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/hdImagingShapeDrawOverride.cpp +++ b/plugin/pxr/maya/lib/pxrUsdMayaGL/hdImagingShapeDrawOverride.cpp @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxr/pxr.h" #include "pxrUsdMayaGL/hdImagingShapeDrawOverride.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/hdImagingShapeDrawOverride.h b/plugin/pxr/maya/lib/pxrUsdMayaGL/hdImagingShapeDrawOverride.h similarity index 77% rename from plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/hdImagingShapeDrawOverride.h rename to plugin/pxr/maya/lib/pxrUsdMayaGL/hdImagingShapeDrawOverride.h index d2350bc11e..b38a59fbe4 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/hdImagingShapeDrawOverride.h +++ b/plugin/pxr/maya/lib/pxrUsdMayaGL/hdImagingShapeDrawOverride.h @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYAGL_HD_IMAGING_SHAPE_DRAW_OVERRIDE_H #define PXRUSDMAYAGL_HD_IMAGING_SHAPE_DRAW_OVERRIDE_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/hdImagingShapeUI.cpp b/plugin/pxr/maya/lib/pxrUsdMayaGL/hdImagingShapeUI.cpp similarity index 74% rename from plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/hdImagingShapeUI.cpp rename to plugin/pxr/maya/lib/pxrUsdMayaGL/hdImagingShapeUI.cpp index 599efeb4d2..51aaa69bf9 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/hdImagingShapeUI.cpp +++ b/plugin/pxr/maya/lib/pxrUsdMayaGL/hdImagingShapeUI.cpp @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxr/pxr.h" #include "pxrUsdMayaGL/hdImagingShapeUI.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/hdImagingShapeUI.h b/plugin/pxr/maya/lib/pxrUsdMayaGL/hdImagingShapeUI.h similarity index 68% rename from plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/hdImagingShapeUI.h rename to plugin/pxr/maya/lib/pxrUsdMayaGL/hdImagingShapeUI.h index c8313cff59..736c051ee4 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/hdImagingShapeUI.h +++ b/plugin/pxr/maya/lib/pxrUsdMayaGL/hdImagingShapeUI.h @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYAGL_HD_IMAGING_SHAPE_UI_H #define PXRUSDMAYAGL_HD_IMAGING_SHAPE_UI_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/hdRenderer.cpp b/plugin/pxr/maya/lib/pxrUsdMayaGL/hdRenderer.cpp similarity index 93% rename from plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/hdRenderer.cpp rename to plugin/pxr/maya/lib/pxrUsdMayaGL/hdRenderer.cpp index 4c0af4e1d1..817a094964 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/hdRenderer.cpp +++ b/plugin/pxr/maya/lib/pxrUsdMayaGL/hdRenderer.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // // Some header #define's Bool as int, which breaks stuff in sdf/types.h. // Include it first to sidestep the problem. :-/ diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/hdRenderer.h b/plugin/pxr/maya/lib/pxrUsdMayaGL/hdRenderer.h similarity index 83% rename from plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/hdRenderer.h rename to plugin/pxr/maya/lib/pxrUsdMayaGL/hdRenderer.h index c87ecb1bd4..a555bf642e 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/hdRenderer.h +++ b/plugin/pxr/maya/lib/pxrUsdMayaGL/hdRenderer.h @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYAGL_HD_RENDERER_H #define PXRUSDMAYAGL_HD_RENDERER_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/instancerImager.cpp b/plugin/pxr/maya/lib/pxrUsdMayaGL/instancerImager.cpp similarity index 93% rename from plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/instancerImager.cpp rename to plugin/pxr/maya/lib/pxrUsdMayaGL/instancerImager.cpp index 21dda5d2b9..a2d48b6874 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/instancerImager.cpp +++ b/plugin/pxr/maya/lib/pxrUsdMayaGL/instancerImager.cpp @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxrUsdMayaGL/instancerImager.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/instancerImager.h b/plugin/pxr/maya/lib/pxrUsdMayaGL/instancerImager.h similarity index 86% rename from plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/instancerImager.h rename to plugin/pxr/maya/lib/pxrUsdMayaGL/instancerImager.h index 9ba93d2051..908d705533 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/instancerImager.h +++ b/plugin/pxr/maya/lib/pxrUsdMayaGL/instancerImager.h @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYAGL_INSTANCER_IMAGER_H #define PXRUSDMAYAGL_INSTANCER_IMAGER_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/instancerShapeAdapter.cpp b/plugin/pxr/maya/lib/pxrUsdMayaGL/instancerShapeAdapter.cpp similarity index 94% rename from plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/instancerShapeAdapter.cpp rename to plugin/pxr/maya/lib/pxrUsdMayaGL/instancerShapeAdapter.cpp index 3f5e874be0..66dacb2eb6 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/instancerShapeAdapter.cpp +++ b/plugin/pxr/maya/lib/pxrUsdMayaGL/instancerShapeAdapter.cpp @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxrUsdMayaGL/instancerShapeAdapter.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/instancerShapeAdapter.h b/plugin/pxr/maya/lib/pxrUsdMayaGL/instancerShapeAdapter.h similarity index 85% rename from plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/instancerShapeAdapter.h rename to plugin/pxr/maya/lib/pxrUsdMayaGL/instancerShapeAdapter.h index 546d0a84e1..1d8f45ef30 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/instancerShapeAdapter.h +++ b/plugin/pxr/maya/lib/pxrUsdMayaGL/instancerShapeAdapter.h @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYAGL_INSTANCER_SHAPE_ADAPTER_H #define PXRUSDMAYAGL_INSTANCER_SHAPE_ADAPTER_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/proxyDrawOverride.cpp b/plugin/pxr/maya/lib/pxrUsdMayaGL/proxyDrawOverride.cpp similarity index 91% rename from plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/proxyDrawOverride.cpp rename to plugin/pxr/maya/lib/pxrUsdMayaGL/proxyDrawOverride.cpp index 6a0e32d9e9..1e6fc94e3f 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/proxyDrawOverride.cpp +++ b/plugin/pxr/maya/lib/pxrUsdMayaGL/proxyDrawOverride.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxr/pxr.h" #include "pxrUsdMayaGL/proxyDrawOverride.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/proxyDrawOverride.h b/plugin/pxr/maya/lib/pxrUsdMayaGL/proxyDrawOverride.h similarity index 75% rename from plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/proxyDrawOverride.h rename to plugin/pxr/maya/lib/pxrUsdMayaGL/proxyDrawOverride.h index e6cc46ac9f..d6ca96fe55 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/proxyDrawOverride.h +++ b/plugin/pxr/maya/lib/pxrUsdMayaGL/proxyDrawOverride.h @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYAGL_PROXY_DRAW_OVERRIDE_H #define PXRUSDMAYAGL_PROXY_DRAW_OVERRIDE_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/proxyShapeDelegate.cpp b/plugin/pxr/maya/lib/pxrUsdMayaGL/proxyShapeDelegate.cpp similarity index 88% rename from plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/proxyShapeDelegate.cpp rename to plugin/pxr/maya/lib/pxrUsdMayaGL/proxyShapeDelegate.cpp index a5308aab0f..a26bdc6dc1 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/proxyShapeDelegate.cpp +++ b/plugin/pxr/maya/lib/pxrUsdMayaGL/proxyShapeDelegate.cpp @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxr/imaging/glf/glew.h" // This header must absolutely come first. diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/proxyShapeUI.cpp b/plugin/pxr/maya/lib/pxrUsdMayaGL/proxyShapeUI.cpp similarity index 87% rename from plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/proxyShapeUI.cpp rename to plugin/pxr/maya/lib/pxrUsdMayaGL/proxyShapeUI.cpp index 4322faa5ef..c89a84517c 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/proxyShapeUI.cpp +++ b/plugin/pxr/maya/lib/pxrUsdMayaGL/proxyShapeUI.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxr/pxr.h" #include "pxrUsdMayaGL/proxyShapeUI.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/proxyShapeUI.h b/plugin/pxr/maya/lib/pxrUsdMayaGL/proxyShapeUI.h similarity index 73% rename from plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/proxyShapeUI.h rename to plugin/pxr/maya/lib/pxrUsdMayaGL/proxyShapeUI.h index 6d8d46ca9c..7b964d89f4 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/proxyShapeUI.h +++ b/plugin/pxr/maya/lib/pxrUsdMayaGL/proxyShapeUI.h @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYAGL_PROXY_SHAPE_UI_H #define PXRUSDMAYAGL_PROXY_SHAPE_UI_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/renderParams.h b/plugin/pxr/maya/lib/pxrUsdMayaGL/renderParams.h similarity index 59% rename from plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/renderParams.h rename to plugin/pxr/maya/lib/pxrUsdMayaGL/renderParams.h index c54171fb5a..483c6dd7d8 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/renderParams.h +++ b/plugin/pxr/maya/lib/pxrUsdMayaGL/renderParams.h @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYAGL_RENDER_PARAMS_H #define PXRUSDMAYAGL_RENDER_PARAMS_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/sceneDelegate.cpp b/plugin/pxr/maya/lib/pxrUsdMayaGL/sceneDelegate.cpp similarity index 95% rename from plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/sceneDelegate.cpp rename to plugin/pxr/maya/lib/pxrUsdMayaGL/sceneDelegate.cpp index 293e127ace..23123dea8a 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/sceneDelegate.cpp +++ b/plugin/pxr/maya/lib/pxrUsdMayaGL/sceneDelegate.cpp @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxrUsdMayaGL/sceneDelegate.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/sceneDelegate.h b/plugin/pxr/maya/lib/pxrUsdMayaGL/sceneDelegate.h similarity index 78% rename from plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/sceneDelegate.h rename to plugin/pxr/maya/lib/pxrUsdMayaGL/sceneDelegate.h index eb142fc5e6..8de65c7e3e 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/sceneDelegate.h +++ b/plugin/pxr/maya/lib/pxrUsdMayaGL/sceneDelegate.h @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYAGL_SCENE_DELEGATE_H #define PXRUSDMAYAGL_SCENE_DELEGATE_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/shapeAdapter.cpp b/plugin/pxr/maya/lib/pxrUsdMayaGL/shapeAdapter.cpp similarity index 95% rename from plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/shapeAdapter.cpp rename to plugin/pxr/maya/lib/pxrUsdMayaGL/shapeAdapter.cpp index b4ad54c10a..fb1fc3e369 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/shapeAdapter.cpp +++ b/plugin/pxr/maya/lib/pxrUsdMayaGL/shapeAdapter.cpp @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxrUsdMayaGL/shapeAdapter.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/shapeAdapter.h b/plugin/pxr/maya/lib/pxrUsdMayaGL/shapeAdapter.h similarity index 91% rename from plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/shapeAdapter.h rename to plugin/pxr/maya/lib/pxrUsdMayaGL/shapeAdapter.h index ace7b141dc..5e21996e7e 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/shapeAdapter.h +++ b/plugin/pxr/maya/lib/pxrUsdMayaGL/shapeAdapter.h @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYAGL_SHAPE_ADAPTER_H #define PXRUSDMAYAGL_SHAPE_ADAPTER_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/softSelectHelper.cpp b/plugin/pxr/maya/lib/pxrUsdMayaGL/softSelectHelper.cpp similarity index 77% rename from plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/softSelectHelper.cpp rename to plugin/pxr/maya/lib/pxrUsdMayaGL/softSelectHelper.cpp index c9ffd468a4..bd45ccbf24 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/softSelectHelper.cpp +++ b/plugin/pxr/maya/lib/pxrUsdMayaGL/softSelectHelper.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxr/pxr.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/softSelectHelper.h b/plugin/pxr/maya/lib/pxrUsdMayaGL/softSelectHelper.h similarity index 74% rename from plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/softSelectHelper.h rename to plugin/pxr/maya/lib/pxrUsdMayaGL/softSelectHelper.h index 62ddbf3f49..9928cb7149 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/softSelectHelper.h +++ b/plugin/pxr/maya/lib/pxrUsdMayaGL/softSelectHelper.h @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYAGL_SOFT_SELECT_HELPER_H #define PXRUSDMAYAGL_SOFT_SELECT_HELPER_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/usdProxyShapeAdapter.cpp b/plugin/pxr/maya/lib/pxrUsdMayaGL/usdProxyShapeAdapter.cpp similarity index 93% rename from plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/usdProxyShapeAdapter.cpp rename to plugin/pxr/maya/lib/pxrUsdMayaGL/usdProxyShapeAdapter.cpp index 662be67665..4df9f46b6d 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/usdProxyShapeAdapter.cpp +++ b/plugin/pxr/maya/lib/pxrUsdMayaGL/usdProxyShapeAdapter.cpp @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxrUsdMayaGL/usdProxyShapeAdapter.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/usdProxyShapeAdapter.h b/plugin/pxr/maya/lib/pxrUsdMayaGL/usdProxyShapeAdapter.h similarity index 83% rename from plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/usdProxyShapeAdapter.h rename to plugin/pxr/maya/lib/pxrUsdMayaGL/usdProxyShapeAdapter.h index ac38f5475b..128bc439c9 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/usdProxyShapeAdapter.h +++ b/plugin/pxr/maya/lib/pxrUsdMayaGL/usdProxyShapeAdapter.h @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYAGL_USD_PROXY_SHAPE_ADAPTER_H #define PXRUSDMAYAGL_USD_PROXY_SHAPE_ADAPTER_H diff --git a/plugin/pxr/maya/lib/pxrUsdMayaGL/userData.cpp b/plugin/pxr/maya/lib/pxrUsdMayaGL/userData.cpp new file mode 100644 index 0000000000..2df0268a43 --- /dev/null +++ b/plugin/pxr/maya/lib/pxrUsdMayaGL/userData.cpp @@ -0,0 +1,45 @@ +// +// Copyright 2018 Pixar +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +#include "pxrUsdMayaGL/userData.h" + +#include "pxr/pxr.h" +#include "pxrUsdMayaGL/api.h" + +#include + + +PXR_NAMESPACE_OPEN_SCOPE + + +/// Note that we set deleteAfterUse=false when calling the MUserData +/// constructor. This ensures that the draw data survives across multiple draw +/// passes in Viewport 2.0 (e.g. a shadow pass and a color pass). +/// +/// drawShape is initialized to false, since we expect that the +/// pxrHdImagingShape will be the only one to set it to true. +PxrMayaHdUserData::PxrMayaHdUserData() : + MUserData(/* deleteAfterUse = */ false), + drawShape(false) +{ +} + +/* virtual */ +PxrMayaHdUserData::~PxrMayaHdUserData() +{ +} + + +PXR_NAMESPACE_CLOSE_SCOPE diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/userData.h b/plugin/pxr/maya/lib/pxrUsdMayaGL/userData.h similarity index 54% rename from plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/userData.h rename to plugin/pxr/maya/lib/pxrUsdMayaGL/userData.h index d5bd84b62c..6654f7dfbc 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/userData.h +++ b/plugin/pxr/maya/lib/pxrUsdMayaGL/userData.h @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYAGL_USER_DATA_H #define PXRUSDMAYAGL_USER_DATA_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/AEpxrUsdProxyShapeTemplate.mel b/plugin/pxr/maya/lib/usdMaya/AEpxrUsdProxyShapeTemplate.mel similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/AEpxrUsdProxyShapeTemplate.mel rename to plugin/pxr/maya/lib/usdMaya/AEpxrUsdProxyShapeTemplate.mel diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/AEpxrUsdReferenceAssemblyTemplate.py b/plugin/pxr/maya/lib/usdMaya/AEpxrUsdReferenceAssemblyTemplate.py similarity index 91% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/AEpxrUsdReferenceAssemblyTemplate.py rename to plugin/pxr/maya/lib/usdMaya/AEpxrUsdReferenceAssemblyTemplate.py index b4a883df16..6634c7aace 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/AEpxrUsdReferenceAssemblyTemplate.py +++ b/plugin/pxr/maya/lib/usdMaya/AEpxrUsdReferenceAssemblyTemplate.py @@ -1,25 +1,17 @@ # # Copyright 2016 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # from pxr import UsdMaya diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/CMakeLists.txt b/plugin/pxr/maya/lib/usdMaya/CMakeLists.txt similarity index 73% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/CMakeLists.txt rename to plugin/pxr/maya/lib/usdMaya/CMakeLists.txt index d2f03c1430..f98f204400 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/CMakeLists.txt +++ b/plugin/pxr/maya/lib/usdMaya/CMakeLists.txt @@ -237,8 +237,8 @@ pxr_register_test(testPointBasedDeformerNode COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testPointBasedDeformerNode" TESTENV testPointBasedDeformerNode ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -252,8 +252,8 @@ pxr_register_test(testUsdExportAsClip COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdExportAsClip" TESTENV testUsdExportAsClip ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -267,8 +267,8 @@ pxr_register_test(testUsdExportAssembly COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdExportAssembly" TESTENV testUsdExportAssembly ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -282,8 +282,8 @@ pxr_register_test(testUsdExportCamera COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdExportCamera" TESTENV testUsdExportCamera ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -297,8 +297,8 @@ pxr_register_test(testUsdExportColorSets COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdExportColorSets" TESTENV testUsdExportColorSets ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -312,8 +312,8 @@ pxr_register_test(testUsdExportConnected COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdExportConnected" TESTENV testUsdExportConnected ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -328,8 +328,8 @@ pxr_register_test(testUsdExportDisplayColor COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdExportDisplayColor" TESTENV testUsdExportDisplayColor ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -343,8 +343,8 @@ pxr_register_test(testUsdExportEulerFilter COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdExportEulerFilter" TESTENV testUsdExportEulerFilter ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -358,8 +358,8 @@ pxr_register_test(testUsdExportFilterTypes COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdExportFilterTypes" TESTENV testUsdExportFilterTypes ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -373,8 +373,8 @@ pxr_register_test(testUsdExportFrameOffset COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdExportFrameOffset" TESTENV testUsdExportFrameOffset ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -388,8 +388,8 @@ pxr_register_test(testUsdExportInstances COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdExportInstances" TESTENV testUsdExportInstances ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -403,8 +403,8 @@ pxr_register_test(testUsdExportLocator COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdExportLocator" TESTENV testUsdExportLocator ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -418,8 +418,8 @@ pxr_register_test(testUsdExportMesh COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdExportMesh" TESTENV testUsdExportMesh ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -433,8 +433,8 @@ pxr_register_test(testUsdExportNurbsCurve COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdExportNurbsCurve" TESTENV testUsdExportNurbsCurve ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -443,8 +443,8 @@ pxr_register_test(testUsdExportOpenLayer CUSTOM_PYTHON ${MAYA_PY_EXECUTABLE} COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdExportOpenLayer" ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -458,8 +458,8 @@ pxr_register_test(testUsdExportOverImport COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdExportOverImport" TESTENV testUsdExportOverImport ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -473,8 +473,8 @@ pxr_register_test(testUsdExportPackage COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdExportPackage" TESTENV testUsdExportPackage ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -488,8 +488,8 @@ pxr_register_test(testUsdExportParentScope COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdExportParentScope" TESTENV testUsdExportParentScope ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -503,8 +503,8 @@ pxr_register_test(testUsdExportParticles COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdExportParticles" TESTENV testUsdExportParticles ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -518,8 +518,8 @@ pxr_register_test(testUsdExportPointInstancer COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdExportPointInstancer" TESTENV testUsdExportPointInstancer ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -533,8 +533,8 @@ pxr_register_test(testUsdExportPref COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdExportPref" TESTENV testUsdExportPref ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -548,8 +548,8 @@ pxr_register_test(testUsdExportRenderLayerMode COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdExportRenderLayerMode" TESTENV testUsdExportRenderLayerMode ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile MAYA_ENABLE_LEGACY_RENDER_LAYERS=1 @@ -566,8 +566,8 @@ pxr_register_test(testUsdExportRenderLayerMode # COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdExportRfMLight" # TESTENV testUsdExportRfMLight # ENV -# MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin -# MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources +# MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin +# MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources # MAYA_DISABLE_CIP=1 # MAYA_APP_DIR=/maya_profile # ) @@ -581,8 +581,8 @@ pxr_register_test(testUsdExportSelection COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdExportSelection" TESTENV testUsdExportSelection ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -596,8 +596,8 @@ pxr_register_test(testUsdExportShadingInstanced COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdExportShadingInstanced" TESTENV testUsdExportShadingInstanced ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -611,8 +611,8 @@ pxr_register_test(testUsdExportShadingModeDisplayColor COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdExportShadingModeDisplayColor" TESTENV testUsdExportShadingModeDisplayColor ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -626,8 +626,8 @@ pxr_register_test(testUsdExportShadingModePxrRis COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdExportShadingModePxrRis" TESTENV testUsdExportShadingModePxrRis ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -641,8 +641,8 @@ pxr_register_test(testUsdExportSkeleton COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdExportSkeleton" TESTENV testUsdExportSkeleton ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -652,8 +652,8 @@ pxr_register_test(testUsdExportStripNamespaces COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdExportStripNamespaces" TESTENV testUsdExportStripNamespaces ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -668,8 +668,8 @@ pxr_register_test(testUsdExportUVSets TESTENV testUsdExportUVSets ENV PIXMAYA_WRITE_UV_AS_FLOAT2=0 - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -684,8 +684,8 @@ pxr_register_test(testUsdExportUVSetsFloat TESTENV testUsdExportUVSetsFloat ENV PIXMAYA_WRITE_UV_AS_FLOAT2=1 - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -700,8 +700,8 @@ pxr_register_test(testUsdExportVisibilityDefault TESTENV testUsdExportVisibilityDefault ENV PIXMAYA_WRITE_UV_AS_FLOAT2=1 - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -715,8 +715,8 @@ pxr_register_test(testUsdImportAsAssemblies COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImportAsAssemblies" TESTENV testUsdImportAsAssemblies ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -730,8 +730,8 @@ pxr_register_test(testUsdImportCamera COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImportCamera" TESTENV testUsdImportCamera ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -745,8 +745,8 @@ pxr_register_test(testUsdImportColorSets COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImportColorSets" TESTENV testUsdImportColorSets ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -760,8 +760,8 @@ pxr_register_test(testUsdImportFrameRange COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImportFrameRange" TESTENV testUsdImportFrameRange ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -775,8 +775,8 @@ pxr_register_test(testUsdImportMesh COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImportMesh" TESTENV testUsdImportMesh ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -790,8 +790,8 @@ pxr_register_test(testUsdImportNestedAssemblyAnimation COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImportNestedAssemblyAnimation" TESTENV testUsdImportNestedAssemblyAnimation ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -807,8 +807,8 @@ pxr_register_test(testUsdImportNestedAssemblyAnimation # COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImportRfMLight" # TESTENV testUsdImportRfMLight # ENV -# MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin -# MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources +# MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin +# MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources # MAYA_DISABLE_CIP=1 # MAYA_APP_DIR=/maya_profile # ) @@ -822,8 +822,8 @@ pxr_register_test(testUsdImportSessionLayer COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImportSessionLayer" TESTENV testUsdImportSessionLayer ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -837,8 +837,8 @@ pxr_register_test(testUsdImportShadingModeDisplayColor COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImportShadingModeDisplayColor" TESTENV testUsdImportShadingModeDisplayColor ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -852,8 +852,8 @@ pxr_register_test(testUsdImportShadingModePxrRis COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImportShadingModePxrRis" TESTENV testUsdImportShadingModePxrRis ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -867,8 +867,8 @@ pxr_register_test(testUsdImportSkeleton COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImportSkeleton" TESTENV testUsdImportSkeleton ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -882,8 +882,8 @@ pxr_register_test(testUsdTranslateTypelessDefs COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdTranslateTypelessDefs" TESTENV testUsdTranslateTypelessDefs ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -898,8 +898,8 @@ pxr_register_test(testUsdImportUVSets TESTENV testUsdImportUVSets ENV PIXMAYA_READ_FLOAT2_AS_UV=0 - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -914,8 +914,8 @@ pxr_register_test(testUsdImportUVSetsFloat TESTENV testUsdImportUVSetsFloat ENV PIXMAYA_READ_FLOAT2_AS_UV=1 - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -929,8 +929,8 @@ pxr_register_test(testUsdImportXforms COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImportXforms" TESTENV testUsdImportXforms ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -944,8 +944,8 @@ pxr_register_test(testUsdMayaAppDir COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdMayaAppDir" TESTENV testUsdMayaAppDir ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -954,8 +954,8 @@ pxr_register_test(testUsdMayaBlockSceneModificationContext CUSTOM_PYTHON ${MAYA_PY_EXECUTABLE} COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdMayaBlockSceneModificationContext" ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -964,8 +964,8 @@ pxr_register_test(testUsdMayaDiagnosticDelegate CUSTOM_PYTHON ${MAYA_PY_EXECUTABLE} COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdMayaDiagnosticDelegate" ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -979,8 +979,8 @@ pxr_register_test(testUsdMayaGetVariantSetSelections COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdMayaGetVariantSetSelections" TESTENV testUsdMayaGetVariantSetSelections ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -994,8 +994,8 @@ pxr_register_test(testUsdMayaModelKindProcessor COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdMayaModelKindProcessor" TESTENV testUsdMayaModelKindProcessor ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -1009,8 +1009,8 @@ pxr_register_test(testUsdMayaProxyShape COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdMayaProxyShape" TESTENV testUsdMayaProxyShape ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -1024,8 +1024,8 @@ pxr_register_test(testUsdMayaReferenceAssemblyEdits COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdMayaReferenceAssemblyEdits" TESTENV testUsdMayaReferenceAssemblyEdits ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -1039,8 +1039,8 @@ pxr_register_test(testUsdMayaUserExportedAttributes COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdMayaUserExportedAttributes" TESTENV testUsdMayaUserExportedAttributes ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -1054,8 +1054,8 @@ pxr_register_test(testUsdMayaAdaptorGeom COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdMayaAdaptorGeom" TESTENV testUsdMayaAdaptorGeom ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -1069,8 +1069,8 @@ pxr_register_test(testUsdMayaAdaptorMetadata COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdMayaAdaptorMetadata" TESTENV testUsdMayaAdaptorMetadata ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -1084,8 +1084,8 @@ pxr_register_test(testUsdReferenceAssemblyChangeRepresentations COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdReferenceAssemblyChangeRepresentations" TESTENV testUsdReferenceAssemblyChangeRepresentations ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -1099,8 +1099,8 @@ pxr_register_test(testUsdReferenceAssemblySelection COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdReferenceAssemblySelection" TESTENV testUsdReferenceAssemblySelection ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -1110,8 +1110,8 @@ pxr_register_test(testUsdMayaXformStack COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdMayaXformStack" TESTENV testUsdMayaXformStack ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/__init__.py b/plugin/pxr/maya/lib/usdMaya/__init__.py similarity index 84% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/__init__.py rename to plugin/pxr/maya/lib/usdMaya/__init__.py index 4b15496e86..9c49c1cd91 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/__init__.py +++ b/plugin/pxr/maya/lib/usdMaya/__init__.py @@ -1,25 +1,17 @@ # # Copyright 2016 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # from . import _usdMaya from pxr import Tf diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/adaptor.cpp b/plugin/pxr/maya/lib/usdMaya/adaptor.cpp similarity index 96% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/adaptor.cpp rename to plugin/pxr/maya/lib/usdMaya/adaptor.cpp index 04f1170c29..2836269e0c 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/adaptor.cpp +++ b/plugin/pxr/maya/lib/usdMaya/adaptor.cpp @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/adaptor.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/adaptor.h b/plugin/pxr/maya/lib/usdMaya/adaptor.h similarity index 96% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/adaptor.h rename to plugin/pxr/maya/lib/usdMaya/adaptor.h index b576cc03a8..1e2d476945 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/adaptor.h +++ b/plugin/pxr/maya/lib/usdMaya/adaptor.h @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYA_ADAPTOR_H #define PXRUSDMAYA_ADAPTOR_H diff --git a/plugin/pxr/maya/lib/usdMaya/api.h b/plugin/pxr/maya/lib/usdMaya/api.h new file mode 100644 index 0000000000..206da3377a --- /dev/null +++ b/plugin/pxr/maya/lib/usdMaya/api.h @@ -0,0 +1,32 @@ +// +// Copyright 2017 Pixar +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +#ifndef PXRUSDMAYA_API_H +#define PXRUSDMAYA_API_H + +#include "pxr/base/arch/export.h" + +#if defined(USDMAYA_EXPORTS) +# define PXRUSDMAYA_API ARCH_EXPORT +# define PXRUSDMAYA_API_TEMPLATE_CLASS(...) ARCH_EXPORT_TEMPLATE(class, __VA_ARGS__) +# define PXRUSDMAYA_API_TEMPLATE_STRUCT(...) ARCH_EXPORT_TEMPLATE(struct, __VA_ARGS__) +#else +# define PXRUSDMAYA_API ARCH_IMPORT +# define PXRUSDMAYA_API_TEMPLATE_CLASS(...) ARCH_IMPORT_TEMPLATE(class, __VA_ARGS__) +# define PXRUSDMAYA_API_TEMPLATE_STRUCT(...) ARCH_IMPORT_TEMPLATE(struct, __VA_ARGS__) +#endif +#define PXRUSDMAYA_LOCAL ARCH_HIDDEN + +#endif diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/blockSceneModificationContext.cpp b/plugin/pxr/maya/lib/usdMaya/blockSceneModificationContext.cpp similarity index 53% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/blockSceneModificationContext.cpp rename to plugin/pxr/maya/lib/usdMaya/blockSceneModificationContext.cpp index 87fab8936b..77ddf4cedf 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/blockSceneModificationContext.cpp +++ b/plugin/pxr/maya/lib/usdMaya/blockSceneModificationContext.cpp @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxr/pxr.h" #include "usdMaya/blockSceneModificationContext.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/blockSceneModificationContext.h b/plugin/pxr/maya/lib/usdMaya/blockSceneModificationContext.h similarity index 55% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/blockSceneModificationContext.h rename to plugin/pxr/maya/lib/usdMaya/blockSceneModificationContext.h index 240aed1a57..f2fbe5abc3 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/blockSceneModificationContext.h +++ b/plugin/pxr/maya/lib/usdMaya/blockSceneModificationContext.h @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYA_BLOCK_SCENE_MODIFICATION_CONTEXT_H #define PXRUSDMAYA_BLOCK_SCENE_MODIFICATION_CONTEXT_H diff --git a/plugin/pxr/maya/lib/usdMaya/chaser.cpp b/plugin/pxr/maya/lib/usdMaya/chaser.cpp new file mode 100644 index 0000000000..c70c48dc0a --- /dev/null +++ b/plugin/pxr/maya/lib/usdMaya/chaser.cpp @@ -0,0 +1,42 @@ +// +// Copyright 2016 Pixar +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +#include "usdMaya/chaser.h" + +PXR_NAMESPACE_OPEN_SCOPE + +bool +UsdMayaChaser::ExportDefault() +{ + // Do nothing by default. + return true; +} + +bool +UsdMayaChaser::ExportFrame(const UsdTimeCode& time) +{ + // Do nothing by default. + return true; +} + +bool +UsdMayaChaser::PostExport() +{ + // Do nothing by default. + return true; +} + +PXR_NAMESPACE_CLOSE_SCOPE + diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/chaser.h b/plugin/pxr/maya/lib/usdMaya/chaser.h similarity index 71% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/chaser.h rename to plugin/pxr/maya/lib/usdMaya/chaser.h index 4b08e1c088..af164866ea 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/chaser.h +++ b/plugin/pxr/maya/lib/usdMaya/chaser.h @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYA_CHASER_H #define PXRUSDMAYA_CHASER_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/chaserRegistry.cpp b/plugin/pxr/maya/lib/usdMaya/chaserRegistry.cpp similarity index 72% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/chaserRegistry.cpp rename to plugin/pxr/maya/lib/usdMaya/chaserRegistry.cpp index 7d95f543af..f43da67ce4 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/chaserRegistry.cpp +++ b/plugin/pxr/maya/lib/usdMaya/chaserRegistry.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/chaserRegistry.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/chaserRegistry.h b/plugin/pxr/maya/lib/usdMaya/chaserRegistry.h similarity index 82% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/chaserRegistry.h rename to plugin/pxr/maya/lib/usdMaya/chaserRegistry.h index 71a5908e43..593f3eaa52 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/chaserRegistry.h +++ b/plugin/pxr/maya/lib/usdMaya/chaserRegistry.h @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYA_CHASER_REGISTRY_H #define PXRUSDMAYA_CHASER_REGISTRY_H diff --git a/plugin/pxr/maya/lib/usdMaya/colorSpace.cpp b/plugin/pxr/maya/lib/usdMaya/colorSpace.cpp new file mode 100644 index 0000000000..3cd18de21c --- /dev/null +++ b/plugin/pxr/maya/lib/usdMaya/colorSpace.cpp @@ -0,0 +1,33 @@ +// +// Copyright 2018 Pixar +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +#include "usdMaya/colorSpace.h" + +#include "pxr/base/tf/envSetting.h" + +PXR_NAMESPACE_USING_DIRECTIVE + +TF_DEFINE_ENV_SETTING(PIXMAYA_LINEAR_COLORS, false, + "If colors from maya should be treated as linear. " + "When false, colors are assumed to be gamma-corrected."); + +bool +UsdMayaColorSpace::IsColorManaged() +{ + // in theory this could vary per scene, but we think mixing that within any + // given pipeline is likely confusing. Also, we want to avoid this function + // calling out to mel. + return TfGetEnvSetting(PIXMAYA_LINEAR_COLORS); +} diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/colorSpace.h b/plugin/pxr/maya/lib/usdMaya/colorSpace.h similarity index 68% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/colorSpace.h rename to plugin/pxr/maya/lib/usdMaya/colorSpace.h index bdc7017b7b..c582d29dab 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/colorSpace.h +++ b/plugin/pxr/maya/lib/usdMaya/colorSpace.h @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYA_COLORSPACE_H #define PXRUSDMAYA_COLORSPACE_H diff --git a/plugin/pxr/maya/lib/usdMaya/debugCodes.cpp b/plugin/pxr/maya/lib/usdMaya/debugCodes.cpp new file mode 100644 index 0000000000..ba9d0c57a4 --- /dev/null +++ b/plugin/pxr/maya/lib/usdMaya/debugCodes.cpp @@ -0,0 +1,32 @@ +// +// Copyright 2016 Pixar +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +#include "usdMaya/debugCodes.h" + +#include "pxr/base/tf/registryManager.h" + +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."); +} + +PXR_NAMESPACE_CLOSE_SCOPE + diff --git a/plugin/pxr/maya/lib/usdMaya/debugCodes.h b/plugin/pxr/maya/lib/usdMaya/debugCodes.h new file mode 100644 index 0000000000..66570694bd --- /dev/null +++ b/plugin/pxr/maya/lib/usdMaya/debugCodes.h @@ -0,0 +1,33 @@ +// +// Copyright 2016 Pixar +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +#ifndef PXRUSDMAYA_DEBUGCODES_H +#define PXRUSDMAYA_DEBUGCODES_H + +#include "pxr/pxr.h" +#include "pxr/base/tf/debug.h" + +PXR_NAMESPACE_OPEN_SCOPE + + +TF_DEBUG_CODES( + PXRUSDMAYA_REGISTRY, + PXRUSDMAYA_DIAGNOSTICS +); + + +PXR_NAMESPACE_CLOSE_SCOPE + +#endif diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/diagnosticDelegate.cpp b/plugin/pxr/maya/lib/usdMaya/diagnosticDelegate.cpp similarity index 88% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/diagnosticDelegate.cpp rename to plugin/pxr/maya/lib/usdMaya/diagnosticDelegate.cpp index ff029ab47f..49b4b71ed5 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/diagnosticDelegate.cpp +++ b/plugin/pxr/maya/lib/usdMaya/diagnosticDelegate.cpp @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/diagnosticDelegate.h" @@ -31,6 +23,8 @@ #include +#include + PXR_NAMESPACE_OPEN_SCOPE TF_DEFINE_ENV_SETTING(PIXMAYA_DIAGNOSTICS_BATCH, true, diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/diagnosticDelegate.h b/plugin/pxr/maya/lib/usdMaya/diagnosticDelegate.h similarity index 82% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/diagnosticDelegate.h rename to plugin/pxr/maya/lib/usdMaya/diagnosticDelegate.h index 8b7f3b049e..2185667ff4 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/diagnosticDelegate.h +++ b/plugin/pxr/maya/lib/usdMaya/diagnosticDelegate.h @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYA_DIAGNOSTICDELEGATE_H #define PXRUSDMAYA_DIAGNOSTICDELEGATE_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/editUtil.cpp b/plugin/pxr/maya/lib/usdMaya/editUtil.cpp similarity index 91% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/editUtil.cpp rename to plugin/pxr/maya/lib/usdMaya/editUtil.cpp index c02a5d2f1f..c14017115d 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/editUtil.cpp +++ b/plugin/pxr/maya/lib/usdMaya/editUtil.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/editUtil.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/editUtil.h b/plugin/pxr/maya/lib/usdMaya/editUtil.h similarity index 79% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/editUtil.h rename to plugin/pxr/maya/lib/usdMaya/editUtil.h index 70aa061c1a..cb63d98ac6 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/editUtil.h +++ b/plugin/pxr/maya/lib/usdMaya/editUtil.h @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYA_EDITUTIL_H #define PXRUSDMAYA_EDITUTIL_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/exportCommand.cpp b/plugin/pxr/maya/lib/usdMaya/exportCommand.cpp similarity index 92% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/exportCommand.cpp rename to plugin/pxr/maya/lib/usdMaya/exportCommand.cpp index f2e3d71218..c4ebf0c2ba 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/exportCommand.cpp +++ b/plugin/pxr/maya/lib/usdMaya/exportCommand.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/exportCommand.h" diff --git a/plugin/pxr/maya/lib/usdMaya/exportCommand.h b/plugin/pxr/maya/lib/usdMaya/exportCommand.h new file mode 100644 index 0000000000..de14776197 --- /dev/null +++ b/plugin/pxr/maya/lib/usdMaya/exportCommand.h @@ -0,0 +1,51 @@ +// +// Copyright 2016 Pixar +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +#ifndef PXRUSDMAYA_EXPORT_COMMAND_H +#define PXRUSDMAYA_EXPORT_COMMAND_H + +/// \file usdMaya/exportCommand.h + +#include "usdMaya/api.h" + +#include "pxr/pxr.h" + +#include + +PXR_NAMESPACE_OPEN_SCOPE + + +class UsdMayaExportCommand : public MPxCommand +{ + public: + PXRUSDMAYA_API + UsdMayaExportCommand(); + PXRUSDMAYA_API + ~UsdMayaExportCommand() override; + + PXRUSDMAYA_API + MStatus doIt(const MArgList& args) override; + bool isUndoable () const override { return false; }; + + PXRUSDMAYA_API + static MSyntax createSyntax(); + PXRUSDMAYA_API + static void* creator(); +}; + + +PXR_NAMESPACE_CLOSE_SCOPE + +#endif diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/exportTranslator.cpp b/plugin/pxr/maya/lib/usdMaya/exportTranslator.cpp similarity index 87% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/exportTranslator.cpp rename to plugin/pxr/maya/lib/usdMaya/exportTranslator.cpp index 110fbc1e73..321d5f1a14 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/exportTranslator.cpp +++ b/plugin/pxr/maya/lib/usdMaya/exportTranslator.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/exportTranslator.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/exportTranslator.h b/plugin/pxr/maya/lib/usdMaya/exportTranslator.h similarity index 67% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/exportTranslator.h rename to plugin/pxr/maya/lib/usdMaya/exportTranslator.h index 44eebef1a8..4f40c71993 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/exportTranslator.h +++ b/plugin/pxr/maya/lib/usdMaya/exportTranslator.h @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYA_EXPORT_TRANSLATOR_H #define PXRUSDMAYA_EXPORT_TRANSLATOR_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/fallbackPrimReader.cpp b/plugin/pxr/maya/lib/usdMaya/fallbackPrimReader.cpp similarity index 60% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/fallbackPrimReader.cpp rename to plugin/pxr/maya/lib/usdMaya/fallbackPrimReader.cpp index f06d2324b9..31976219ef 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/fallbackPrimReader.cpp +++ b/plugin/pxr/maya/lib/usdMaya/fallbackPrimReader.cpp @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/fallbackPrimReader.h" diff --git a/plugin/pxr/maya/lib/usdMaya/fallbackPrimReader.h b/plugin/pxr/maya/lib/usdMaya/fallbackPrimReader.h new file mode 100644 index 0000000000..e2cd2e5d71 --- /dev/null +++ b/plugin/pxr/maya/lib/usdMaya/fallbackPrimReader.h @@ -0,0 +1,39 @@ +// +// Copyright 2018 Pixar +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +#ifndef PXRUSDMAYA_FALLBACK_PRIM_READER_H +#define PXRUSDMAYA_FALLBACK_PRIM_READER_H + +/// \file usdMaya/fallbackPrimReader.h + +#include "usdMaya/primReader.h" +#include "usdMaya/primReaderRegistry.h" + +PXR_NAMESPACE_OPEN_SCOPE + +/// This is a special prim reader that is used whenever a typeless prim or prim +/// with unknown types is encountered when traversing USD. +class UsdMaya_FallbackPrimReader : public UsdMayaPrimReader { +public: + UsdMaya_FallbackPrimReader(const UsdMayaPrimReaderArgs& args); + + virtual bool Read(UsdMayaPrimReaderContext* context); + + static UsdMayaPrimReaderRegistry::ReaderFactoryFn CreateFactory(); +}; + +PXR_NAMESPACE_CLOSE_SCOPE + +#endif diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/functorPrimReader.cpp b/plugin/pxr/maya/lib/usdMaya/functorPrimReader.cpp similarity index 54% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/functorPrimReader.cpp rename to plugin/pxr/maya/lib/usdMaya/functorPrimReader.cpp index 608c47d46d..4b317e5fac 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/functorPrimReader.cpp +++ b/plugin/pxr/maya/lib/usdMaya/functorPrimReader.cpp @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/functorPrimReader.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/functorPrimReader.h b/plugin/pxr/maya/lib/usdMaya/functorPrimReader.h similarity index 58% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/functorPrimReader.h rename to plugin/pxr/maya/lib/usdMaya/functorPrimReader.h index 6395e69636..121b59f7dd 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/functorPrimReader.h +++ b/plugin/pxr/maya/lib/usdMaya/functorPrimReader.h @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYA_FUNCTORPRIMREADER_H #define PXRUSDMAYA_FUNCTORPRIMREADER_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/functorPrimWriter.cpp b/plugin/pxr/maya/lib/usdMaya/functorPrimWriter.cpp similarity index 73% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/functorPrimWriter.cpp rename to plugin/pxr/maya/lib/usdMaya/functorPrimWriter.cpp index cc3bee8fba..75c909e895 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/functorPrimWriter.cpp +++ b/plugin/pxr/maya/lib/usdMaya/functorPrimWriter.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxr/pxr.h" #include "usdMaya/functorPrimWriter.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/functorPrimWriter.h b/plugin/pxr/maya/lib/usdMaya/functorPrimWriter.h similarity index 68% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/functorPrimWriter.h rename to plugin/pxr/maya/lib/usdMaya/functorPrimWriter.h index bb262d5043..7aeb57525a 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/functorPrimWriter.h +++ b/plugin/pxr/maya/lib/usdMaya/functorPrimWriter.h @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYA_FUNCTOR_PRIM_WRITER_H #define PXRUSDMAYA_FUNCTOR_PRIM_WRITER_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/hdImagingShape.cpp b/plugin/pxr/maya/lib/usdMaya/hdImagingShape.cpp similarity index 92% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/hdImagingShape.cpp rename to plugin/pxr/maya/lib/usdMaya/hdImagingShape.cpp index 2c0ef406bb..2b5c4af9f1 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/hdImagingShape.cpp +++ b/plugin/pxr/maya/lib/usdMaya/hdImagingShape.cpp @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxr/pxr.h" #include "usdMaya/hdImagingShape.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/hdImagingShape.h b/plugin/pxr/maya/lib/usdMaya/hdImagingShape.h similarity index 80% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/hdImagingShape.h rename to plugin/pxr/maya/lib/usdMaya/hdImagingShape.h index b036dabab3..a287b60a7b 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/hdImagingShape.h +++ b/plugin/pxr/maya/lib/usdMaya/hdImagingShape.h @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYA_HD_IMAGING_SHAPE_H #define PXRUSDMAYA_HD_IMAGING_SHAPE_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/importCommand.cpp b/plugin/pxr/maya/lib/usdMaya/importCommand.cpp similarity index 88% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/importCommand.cpp rename to plugin/pxr/maya/lib/usdMaya/importCommand.cpp index d77c0c0c24..2fd6b53354 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/importCommand.cpp +++ b/plugin/pxr/maya/lib/usdMaya/importCommand.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/importCommand.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/importCommand.h b/plugin/pxr/maya/lib/usdMaya/importCommand.h similarity index 53% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/importCommand.h rename to plugin/pxr/maya/lib/usdMaya/importCommand.h index 05bd7599af..6165219354 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/importCommand.h +++ b/plugin/pxr/maya/lib/usdMaya/importCommand.h @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYA_IMPORT_COMMAND_H #define PXRUSDMAYA_IMPORT_COMMAND_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/importTranslator.cpp b/plugin/pxr/maya/lib/usdMaya/importTranslator.cpp similarity index 84% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/importTranslator.cpp rename to plugin/pxr/maya/lib/usdMaya/importTranslator.cpp index 2866e29af5..09e6df35f7 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/importTranslator.cpp +++ b/plugin/pxr/maya/lib/usdMaya/importTranslator.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/importTranslator.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/importTranslator.h b/plugin/pxr/maya/lib/usdMaya/importTranslator.h similarity index 66% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/importTranslator.h rename to plugin/pxr/maya/lib/usdMaya/importTranslator.h index 19678b6f77..fd2c7303f3 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/importTranslator.h +++ b/plugin/pxr/maya/lib/usdMaya/importTranslator.h @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYA_IMPORT_TRANSLATOR_H #define PXRUSDMAYA_IMPORT_TRANSLATOR_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/instancedNodeWriter.cpp b/plugin/pxr/maya/lib/usdMaya/instancedNodeWriter.cpp similarity index 88% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/instancedNodeWriter.cpp rename to plugin/pxr/maya/lib/usdMaya/instancedNodeWriter.cpp index e5d48bd495..3b6a8617b2 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/instancedNodeWriter.cpp +++ b/plugin/pxr/maya/lib/usdMaya/instancedNodeWriter.cpp @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxr/pxr.h" #include "usdMaya/instancedNodeWriter.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/instancedNodeWriter.h b/plugin/pxr/maya/lib/usdMaya/instancedNodeWriter.h similarity index 62% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/instancedNodeWriter.h rename to plugin/pxr/maya/lib/usdMaya/instancedNodeWriter.h index ce3072e6bf..b5e84ee275 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/instancedNodeWriter.h +++ b/plugin/pxr/maya/lib/usdMaya/instancedNodeWriter.h @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYA_INSTANCED_NODE_WRITER_H #define PXRUSDMAYA_INSTANCED_NODE_WRITER_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/jobArgs.cpp b/plugin/pxr/maya/lib/usdMaya/jobArgs.cpp similarity index 96% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/jobArgs.cpp rename to plugin/pxr/maya/lib/usdMaya/jobArgs.cpp index 297de39933..e84523a392 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/jobArgs.cpp +++ b/plugin/pxr/maya/lib/usdMaya/jobArgs.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/jobArgs.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/jobArgs.h b/plugin/pxr/maya/lib/usdMaya/jobArgs.h similarity index 90% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/jobArgs.h rename to plugin/pxr/maya/lib/usdMaya/jobArgs.h index 791851a56b..4688726b62 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/jobArgs.h +++ b/plugin/pxr/maya/lib/usdMaya/jobArgs.h @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYA_JOB_ARGS_H #define PXRUSDMAYA_JOB_ARGS_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/listShadingModesCommand.cpp b/plugin/pxr/maya/lib/usdMaya/listShadingModesCommand.cpp similarity index 64% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/listShadingModesCommand.cpp rename to plugin/pxr/maya/lib/usdMaya/listShadingModesCommand.cpp index 8045ba6622..62f3f57ecb 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/listShadingModesCommand.cpp +++ b/plugin/pxr/maya/lib/usdMaya/listShadingModesCommand.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/listShadingModesCommand.h" diff --git a/plugin/pxr/maya/lib/usdMaya/listShadingModesCommand.h b/plugin/pxr/maya/lib/usdMaya/listShadingModesCommand.h new file mode 100644 index 0000000000..a1b3104479 --- /dev/null +++ b/plugin/pxr/maya/lib/usdMaya/listShadingModesCommand.h @@ -0,0 +1,49 @@ +// +// Copyright 2016 Pixar +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +#ifndef PXRUSDMAYA_LIST_SHADING_MODES_COMMAND_H +#define PXRUSDMAYA_LIST_SHADING_MODES_COMMAND_H + +/// \file usdMaya/listShadingModesCommand.h + +#include "usdMaya/api.h" + +#include "pxr/pxr.h" + +#include + +PXR_NAMESPACE_OPEN_SCOPE + +class UsdMayaListShadingModesCommand : public MPxCommand +{ +public: + PXRUSDMAYA_API + UsdMayaListShadingModesCommand(); + PXRUSDMAYA_API + ~UsdMayaListShadingModesCommand() override; + + PXRUSDMAYA_API + MStatus doIt(const MArgList& args) override; + bool isUndoable () const override { return false; }; + + PXRUSDMAYA_API + static MSyntax createSyntax(); + PXRUSDMAYA_API + static void* creator(); +}; + +PXR_NAMESPACE_CLOSE_SCOPE + +#endif diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/meshUtil.cpp b/plugin/pxr/maya/lib/usdMaya/meshUtil.cpp similarity index 92% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/meshUtil.cpp rename to plugin/pxr/maya/lib/usdMaya/meshUtil.cpp index b79b70c422..81ed1daa22 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/meshUtil.cpp +++ b/plugin/pxr/maya/lib/usdMaya/meshUtil.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/meshUtil.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/meshUtil.h b/plugin/pxr/maya/lib/usdMaya/meshUtil.h similarity index 73% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/meshUtil.h rename to plugin/pxr/maya/lib/usdMaya/meshUtil.h index e5491fe00a..fbed78dc0e 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/meshUtil.h +++ b/plugin/pxr/maya/lib/usdMaya/meshUtil.h @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // /// \file usdMaya/meshUtil.h diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/modelKindProcessor.cpp b/plugin/pxr/maya/lib/usdMaya/modelKindProcessor.cpp similarity index 91% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/modelKindProcessor.cpp rename to plugin/pxr/maya/lib/usdMaya/modelKindProcessor.cpp index 97a02a0163..803bf886fd 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/modelKindProcessor.cpp +++ b/plugin/pxr/maya/lib/usdMaya/modelKindProcessor.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/modelKindProcessor.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/modelKindProcessor.h b/plugin/pxr/maya/lib/usdMaya/modelKindProcessor.h similarity index 76% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/modelKindProcessor.h rename to plugin/pxr/maya/lib/usdMaya/modelKindProcessor.h index f078451a4a..e7e0b5cfac 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/modelKindProcessor.h +++ b/plugin/pxr/maya/lib/usdMaya/modelKindProcessor.h @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYA_MODEL_KIND_PROCESSOR_H #define PXRUSDMAYA_MODEL_KIND_PROCESSOR_H diff --git a/plugin/pxr/maya/lib/usdMaya/module.cpp b/plugin/pxr/maya/lib/usdMaya/module.cpp new file mode 100644 index 0000000000..6d6ff07a45 --- /dev/null +++ b/plugin/pxr/maya/lib/usdMaya/module.cpp @@ -0,0 +1,36 @@ +// +// Copyright 2016 Pixar +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +#include "pxr/pxr.h" +#include "pxr/base/tf/pyModule.h" + +PXR_NAMESPACE_USING_DIRECTIVE + +TF_WRAP_MODULE { + TF_WRAP(Adaptor); + TF_WRAP(Assembly); + TF_WRAP(BlockSceneModificationContext); + TF_WRAP(ColorSpace); + TF_WRAP(DiagnosticDelegate); + TF_WRAP(EditUtil); + TF_WRAP(MeshUtil); + TF_WRAP(Query); + TF_WRAP(ReadUtil); + TF_WRAP(RoundTripUtil); + TF_WRAP(StageCache); + TF_WRAP(UserTaggedAttribute); + TF_WRAP(WriteUtil); + TF_WRAP(XformStack); +} diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/notice.cpp b/plugin/pxr/maya/lib/usdMaya/notice.cpp similarity index 79% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/notice.cpp rename to plugin/pxr/maya/lib/usdMaya/notice.cpp index bc62e5fb5e..0b5d946294 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/notice.cpp +++ b/plugin/pxr/maya/lib/usdMaya/notice.cpp @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/notice.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/notice.h b/plugin/pxr/maya/lib/usdMaya/notice.h similarity index 71% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/notice.h rename to plugin/pxr/maya/lib/usdMaya/notice.h index c8aeac42f3..6187941293 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/notice.h +++ b/plugin/pxr/maya/lib/usdMaya/notice.h @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef USDMAYA_NOTICE_H #define USDMAYA_NOTICE_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/out_pxrUsdProxyShape.xpm b/plugin/pxr/maya/lib/usdMaya/out_pxrUsdProxyShape.xpm similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/out_pxrUsdProxyShape.xpm rename to plugin/pxr/maya/lib/usdMaya/out_pxrUsdProxyShape.xpm diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/out_pxrUsdReferenceAssembly.xpm b/plugin/pxr/maya/lib/usdMaya/out_pxrUsdReferenceAssembly.xpm similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/out_pxrUsdReferenceAssembly.xpm rename to plugin/pxr/maya/lib/usdMaya/out_pxrUsdReferenceAssembly.xpm diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/overview.dox b/plugin/pxr/maya/lib/usdMaya/overview.dox similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/overview.dox rename to plugin/pxr/maya/lib/usdMaya/overview.dox diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/pointBasedDeformerNode.cpp b/plugin/pxr/maya/lib/usdMaya/pointBasedDeformerNode.cpp similarity index 87% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/pointBasedDeformerNode.cpp rename to plugin/pxr/maya/lib/usdMaya/pointBasedDeformerNode.cpp index 404dd4c43f..c96b50a08b 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/pointBasedDeformerNode.cpp +++ b/plugin/pxr/maya/lib/usdMaya/pointBasedDeformerNode.cpp @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/pointBasedDeformerNode.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/pointBasedDeformerNode.h b/plugin/pxr/maya/lib/usdMaya/pointBasedDeformerNode.h similarity index 73% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/pointBasedDeformerNode.h rename to plugin/pxr/maya/lib/usdMaya/pointBasedDeformerNode.h index 8ead65f685..f8916da441 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/pointBasedDeformerNode.h +++ b/plugin/pxr/maya/lib/usdMaya/pointBasedDeformerNode.h @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYA_POINT_BASED_DEFORMER_NODE_H #define PXRUSDMAYA_POINT_BASED_DEFORMER_NODE_H diff --git a/plugin/pxr/maya/lib/usdMaya/primReader.cpp b/plugin/pxr/maya/lib/usdMaya/primReader.cpp new file mode 100644 index 0000000000..20358da92a --- /dev/null +++ b/plugin/pxr/maya/lib/usdMaya/primReader.cpp @@ -0,0 +1,41 @@ +// +// Copyright 2018 Pixar +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +#include "usdMaya/primReader.h" + +PXR_NAMESPACE_OPEN_SCOPE + +UsdMayaPrimReader::UsdMayaPrimReader(const UsdMayaPrimReaderArgs& args) + : _args(args) +{ +} + +bool +UsdMayaPrimReader::HasPostReadSubtree() const +{ + return false; +} + +void +UsdMayaPrimReader::PostReadSubtree(UsdMayaPrimReaderContext*) +{ +} + +const UsdMayaPrimReaderArgs& +UsdMayaPrimReader::_GetArgs() { + return _args; +} + +PXR_NAMESPACE_CLOSE_SCOPE diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/primReader.h b/plugin/pxr/maya/lib/usdMaya/primReader.h similarity index 65% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/primReader.h rename to plugin/pxr/maya/lib/usdMaya/primReader.h index f98be26516..57f92e9c81 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/primReader.h +++ b/plugin/pxr/maya/lib/usdMaya/primReader.h @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYA_MAYAPRIMREADER_H #define PXRUSDMAYA_MAYAPRIMREADER_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/primReaderArgs.cpp b/plugin/pxr/maya/lib/usdMaya/primReaderArgs.cpp similarity index 55% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/primReaderArgs.cpp rename to plugin/pxr/maya/lib/usdMaya/primReaderArgs.cpp index 8a5fbfb6fe..ef0cd1e2b1 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/primReaderArgs.cpp +++ b/plugin/pxr/maya/lib/usdMaya/primReaderArgs.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/primReaderArgs.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/primReaderArgs.h b/plugin/pxr/maya/lib/usdMaya/primReaderArgs.h similarity index 65% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/primReaderArgs.h rename to plugin/pxr/maya/lib/usdMaya/primReaderArgs.h index d201eb6c70..1d0b2d51ee 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/primReaderArgs.h +++ b/plugin/pxr/maya/lib/usdMaya/primReaderArgs.h @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYA_PRIMREADERARGS_H #define PXRUSDMAYA_PRIMREADERARGS_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/primReaderContext.cpp b/plugin/pxr/maya/lib/usdMaya/primReaderContext.cpp similarity index 66% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/primReaderContext.cpp rename to plugin/pxr/maya/lib/usdMaya/primReaderContext.cpp index 26037b321e..b2ee08e1f8 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/primReaderContext.cpp +++ b/plugin/pxr/maya/lib/usdMaya/primReaderContext.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/primReaderContext.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/primReaderContext.h b/plugin/pxr/maya/lib/usdMaya/primReaderContext.h similarity index 73% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/primReaderContext.h rename to plugin/pxr/maya/lib/usdMaya/primReaderContext.h index 56bbad6e3a..690a392354 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/primReaderContext.h +++ b/plugin/pxr/maya/lib/usdMaya/primReaderContext.h @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYA_PRIMREADERCONTEXT_H #define PXRUSDMAYA_PRIMREADERCONTEXT_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/primReaderRegistry.cpp b/plugin/pxr/maya/lib/usdMaya/primReaderRegistry.cpp similarity index 77% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/primReaderRegistry.cpp rename to plugin/pxr/maya/lib/usdMaya/primReaderRegistry.cpp index fbfca08fb8..1e6e216247 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/primReaderRegistry.cpp +++ b/plugin/pxr/maya/lib/usdMaya/primReaderRegistry.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/primReaderRegistry.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/primReaderRegistry.h b/plugin/pxr/maya/lib/usdMaya/primReaderRegistry.h similarity index 83% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/primReaderRegistry.h rename to plugin/pxr/maya/lib/usdMaya/primReaderRegistry.h index a31d42e250..c1509b92f7 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/primReaderRegistry.h +++ b/plugin/pxr/maya/lib/usdMaya/primReaderRegistry.h @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYA_PRIMREADERREGISTRY_H #define PXRUSDMAYA_PRIMREADERREGISTRY_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/primWriter.cpp b/plugin/pxr/maya/lib/usdMaya/primWriter.cpp similarity index 91% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/primWriter.cpp rename to plugin/pxr/maya/lib/usdMaya/primWriter.cpp index 6eadfe7ba0..da1e12ae09 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/primWriter.cpp +++ b/plugin/pxr/maya/lib/usdMaya/primWriter.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxr/pxr.h" #include "usdMaya/primWriter.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/primWriter.h b/plugin/pxr/maya/lib/usdMaya/primWriter.h similarity index 90% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/primWriter.h rename to plugin/pxr/maya/lib/usdMaya/primWriter.h index a9080d9754..37a573f936 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/primWriter.h +++ b/plugin/pxr/maya/lib/usdMaya/primWriter.h @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYA_PRIM_WRITER_H #define PXRUSDMAYA_PRIM_WRITER_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/primWriterArgs.cpp b/plugin/pxr/maya/lib/usdMaya/primWriterArgs.cpp similarity index 66% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/primWriterArgs.cpp rename to plugin/pxr/maya/lib/usdMaya/primWriterArgs.cpp index 19586ed1a3..ef4cca6fe1 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/primWriterArgs.cpp +++ b/plugin/pxr/maya/lib/usdMaya/primWriterArgs.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/primWriterArgs.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/primWriterArgs.h b/plugin/pxr/maya/lib/usdMaya/primWriterArgs.h similarity index 66% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/primWriterArgs.h rename to plugin/pxr/maya/lib/usdMaya/primWriterArgs.h index e505ebe193..f8c4185dc1 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/primWriterArgs.h +++ b/plugin/pxr/maya/lib/usdMaya/primWriterArgs.h @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYA_PRIMWRITERERARGS_H #define PXRUSDMAYA_PRIMWRITERERARGS_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/primWriterContext.cpp b/plugin/pxr/maya/lib/usdMaya/primWriterContext.cpp similarity index 62% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/primWriterContext.cpp rename to plugin/pxr/maya/lib/usdMaya/primWriterContext.cpp index ca7becf1ec..c9c65a0263 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/primWriterContext.cpp +++ b/plugin/pxr/maya/lib/usdMaya/primWriterContext.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/primWriterContext.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/primWriterContext.h b/plugin/pxr/maya/lib/usdMaya/primWriterContext.h similarity index 80% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/primWriterContext.h rename to plugin/pxr/maya/lib/usdMaya/primWriterContext.h index 9d0c076634..72adfc6642 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/primWriterContext.h +++ b/plugin/pxr/maya/lib/usdMaya/primWriterContext.h @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYA_PRIMWRITERCONTEXT_H #define PXRUSDMAYA_PRIMWRITERCONTEXT_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/primWriterRegistry.cpp b/plugin/pxr/maya/lib/usdMaya/primWriterRegistry.cpp similarity index 74% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/primWriterRegistry.cpp rename to plugin/pxr/maya/lib/usdMaya/primWriterRegistry.cpp index e0dd802b84..fc0b8a1a8d 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/primWriterRegistry.cpp +++ b/plugin/pxr/maya/lib/usdMaya/primWriterRegistry.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxr/pxr.h" #include "usdMaya/primWriterRegistry.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/primWriterRegistry.h b/plugin/pxr/maya/lib/usdMaya/primWriterRegistry.h similarity index 87% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/primWriterRegistry.h rename to plugin/pxr/maya/lib/usdMaya/primWriterRegistry.h index fa383d2d71..ca31c5fa29 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/primWriterRegistry.h +++ b/plugin/pxr/maya/lib/usdMaya/primWriterRegistry.h @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYA_PRIM_WRITER_REGISTRY_H #define PXRUSDMAYA_PRIM_WRITER_REGISTRY_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/proxyShape.cpp b/plugin/pxr/maya/lib/usdMaya/proxyShape.cpp similarity index 97% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/proxyShape.cpp rename to plugin/pxr/maya/lib/usdMaya/proxyShape.cpp index 4d18b04401..788697248c 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/proxyShape.cpp +++ b/plugin/pxr/maya/lib/usdMaya/proxyShape.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/proxyShape.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/proxyShape.h b/plugin/pxr/maya/lib/usdMaya/proxyShape.h similarity index 89% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/proxyShape.h rename to plugin/pxr/maya/lib/usdMaya/proxyShape.h index 0b308fa36e..47f0142001 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/proxyShape.h +++ b/plugin/pxr/maya/lib/usdMaya/proxyShape.h @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYA_PROXY_SHAPE_H #define PXRUSDMAYA_PROXY_SHAPE_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/query.cpp b/plugin/pxr/maya/lib/usdMaya/query.cpp similarity index 60% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/query.cpp rename to plugin/pxr/maya/lib/usdMaya/query.cpp index 576a7b6e64..452f330d05 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/query.cpp +++ b/plugin/pxr/maya/lib/usdMaya/query.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/query.h" diff --git a/plugin/pxr/maya/lib/usdMaya/query.h b/plugin/pxr/maya/lib/usdMaya/query.h new file mode 100644 index 0000000000..47f8cc4b70 --- /dev/null +++ b/plugin/pxr/maya/lib/usdMaya/query.h @@ -0,0 +1,47 @@ +// +// Copyright 2016 Pixar +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +#ifndef PXRUSDMAYA_QUERY_H +#define PXRUSDMAYA_QUERY_H + +/// \file usdMaya/query.h + +#include "usdMaya/api.h" + +#include "pxr/pxr.h" + +#include "pxr/usd/usd/stage.h" +#include "pxr/usd/usd/prim.h" + +#include +#include + +PXR_NAMESPACE_OPEN_SCOPE + + +struct UsdMayaQuery +{ + /*! \brief converts a dagPath of a usdStageShapeNode into a usdprim + */ + PXRUSDMAYA_API + static UsdPrim GetPrim(const std::string& shapeName); + PXRUSDMAYA_API + static void ReloadStage(const std::string& shapeName); +}; + + +PXR_NAMESPACE_CLOSE_SCOPE + +#endif diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/readJob.cpp b/plugin/pxr/maya/lib/usdMaya/readJob.cpp similarity index 94% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/readJob.cpp rename to plugin/pxr/maya/lib/usdMaya/readJob.cpp index 8df27c4152..d550b969d9 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/readJob.cpp +++ b/plugin/pxr/maya/lib/usdMaya/readJob.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/readJob.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/readJob.h b/plugin/pxr/maya/lib/usdMaya/readJob.h similarity index 74% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/readJob.h rename to plugin/pxr/maya/lib/usdMaya/readJob.h index c808508363..2dec9903c0 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/readJob.h +++ b/plugin/pxr/maya/lib/usdMaya/readJob.h @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYA_READ_JOB_H #define PXRUSDMAYA_READ_JOB_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/readJob_ImportWithProxies.cpp b/plugin/pxr/maya/lib/usdMaya/readJob_ImportWithProxies.cpp similarity index 93% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/readJob_ImportWithProxies.cpp rename to plugin/pxr/maya/lib/usdMaya/readJob_ImportWithProxies.cpp index 3b2c9df152..81c3df2699 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/readJob_ImportWithProxies.cpp +++ b/plugin/pxr/maya/lib/usdMaya/readJob_ImportWithProxies.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/readJob.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/readUtil.cpp b/plugin/pxr/maya/lib/usdMaya/readUtil.cpp similarity index 96% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/readUtil.cpp rename to plugin/pxr/maya/lib/usdMaya/readUtil.cpp index 449075bd17..67159e968e 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/readUtil.cpp +++ b/plugin/pxr/maya/lib/usdMaya/readUtil.cpp @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/readUtil.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/readUtil.h b/plugin/pxr/maya/lib/usdMaya/readUtil.h similarity index 87% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/readUtil.h rename to plugin/pxr/maya/lib/usdMaya/readUtil.h index ee703fd338..c170659ccf 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/readUtil.h +++ b/plugin/pxr/maya/lib/usdMaya/readUtil.h @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // /// \file usdMaya/readUtil.h diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/referenceAssembly.cpp b/plugin/pxr/maya/lib/usdMaya/referenceAssembly.cpp similarity index 98% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/referenceAssembly.cpp rename to plugin/pxr/maya/lib/usdMaya/referenceAssembly.cpp index e672dd64a0..ce1c122602 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/referenceAssembly.cpp +++ b/plugin/pxr/maya/lib/usdMaya/referenceAssembly.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/referenceAssembly.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/referenceAssembly.h b/plugin/pxr/maya/lib/usdMaya/referenceAssembly.h similarity index 94% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/referenceAssembly.h rename to plugin/pxr/maya/lib/usdMaya/referenceAssembly.h index 21e5df92f4..f5264a397f 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/referenceAssembly.h +++ b/plugin/pxr/maya/lib/usdMaya/referenceAssembly.h @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYA_REFERENCE_ASSEMBLY_H #define PXRUSDMAYA_REFERENCE_ASSEMBLY_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/registryHelper.cpp b/plugin/pxr/maya/lib/usdMaya/registryHelper.cpp similarity index 90% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/registryHelper.cpp rename to plugin/pxr/maya/lib/usdMaya/registryHelper.cpp index d9b2b6a632..56e5931fdd 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/registryHelper.cpp +++ b/plugin/pxr/maya/lib/usdMaya/registryHelper.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/registryHelper.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/registryHelper.h b/plugin/pxr/maya/lib/usdMaya/registryHelper.h similarity index 74% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/registryHelper.h rename to plugin/pxr/maya/lib/usdMaya/registryHelper.h index b4e3adf5aa..9220b71806 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/registryHelper.h +++ b/plugin/pxr/maya/lib/usdMaya/registryHelper.h @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYA_REGISTRYHELPER_H #define PXRUSDMAYA_REGISTRYHELPER_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/roundTripUtil.cpp b/plugin/pxr/maya/lib/usdMaya/roundTripUtil.cpp similarity index 80% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/roundTripUtil.cpp rename to plugin/pxr/maya/lib/usdMaya/roundTripUtil.cpp index 7d2f6225fa..8043aeffcc 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/roundTripUtil.cpp +++ b/plugin/pxr/maya/lib/usdMaya/roundTripUtil.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/roundTripUtil.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/roundTripUtil.h b/plugin/pxr/maya/lib/usdMaya/roundTripUtil.h similarity index 70% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/roundTripUtil.h rename to plugin/pxr/maya/lib/usdMaya/roundTripUtil.h index e5df200858..8f54128796 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/roundTripUtil.h +++ b/plugin/pxr/maya/lib/usdMaya/roundTripUtil.h @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYA_ROUND_TRIP_UTIL_H #define PXRUSDMAYA_ROUND_TRIP_UTIL_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/shaderWriter.cpp b/plugin/pxr/maya/lib/usdMaya/shaderWriter.cpp similarity index 55% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/shaderWriter.cpp rename to plugin/pxr/maya/lib/usdMaya/shaderWriter.cpp index 89b46d7bf9..09a6d17535 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/shaderWriter.cpp +++ b/plugin/pxr/maya/lib/usdMaya/shaderWriter.cpp @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxr/pxr.h" #include "usdMaya/shaderWriter.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/shaderWriter.h b/plugin/pxr/maya/lib/usdMaya/shaderWriter.h similarity index 74% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/shaderWriter.h rename to plugin/pxr/maya/lib/usdMaya/shaderWriter.h index 6bb662e020..c6d4812a1b 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/shaderWriter.h +++ b/plugin/pxr/maya/lib/usdMaya/shaderWriter.h @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYA_SHADER_WRITER_H #define PXRUSDMAYA_SHADER_WRITER_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/shadingModeDisplayColor.cpp b/plugin/pxr/maya/lib/usdMaya/shadingModeDisplayColor.cpp similarity index 93% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/shadingModeDisplayColor.cpp rename to plugin/pxr/maya/lib/usdMaya/shadingModeDisplayColor.cpp index b54feec030..601c777086 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/shadingModeDisplayColor.cpp +++ b/plugin/pxr/maya/lib/usdMaya/shadingModeDisplayColor.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/colorSpace.h" #include "usdMaya/shadingModeExporter.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/shadingModeExporter.cpp b/plugin/pxr/maya/lib/usdMaya/shadingModeExporter.cpp similarity index 87% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/shadingModeExporter.cpp rename to plugin/pxr/maya/lib/usdMaya/shadingModeExporter.cpp index e951fe5db5..4e74e49bf0 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/shadingModeExporter.cpp +++ b/plugin/pxr/maya/lib/usdMaya/shadingModeExporter.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/shadingModeExporter.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/shadingModeExporter.h b/plugin/pxr/maya/lib/usdMaya/shadingModeExporter.h similarity index 69% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/shadingModeExporter.h rename to plugin/pxr/maya/lib/usdMaya/shadingModeExporter.h index 38d5b6cc0f..823fda83d0 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/shadingModeExporter.h +++ b/plugin/pxr/maya/lib/usdMaya/shadingModeExporter.h @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYA_SHADING_MODE_EXPORTER_H #define PXRUSDMAYA_SHADING_MODE_EXPORTER_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/shadingModeExporterContext.cpp b/plugin/pxr/maya/lib/usdMaya/shadingModeExporterContext.cpp similarity index 94% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/shadingModeExporterContext.cpp rename to plugin/pxr/maya/lib/usdMaya/shadingModeExporterContext.cpp index 2415b8990a..64144b8c2d 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/shadingModeExporterContext.cpp +++ b/plugin/pxr/maya/lib/usdMaya/shadingModeExporterContext.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/shadingModeExporterContext.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/shadingModeExporterContext.h b/plugin/pxr/maya/lib/usdMaya/shadingModeExporterContext.h similarity index 84% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/shadingModeExporterContext.h rename to plugin/pxr/maya/lib/usdMaya/shadingModeExporterContext.h index 45dc415bc6..bb59ba8f33 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/shadingModeExporterContext.h +++ b/plugin/pxr/maya/lib/usdMaya/shadingModeExporterContext.h @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYA_SHADING_MODE_EXPORTER_CONTEXT_H #define PXRUSDMAYA_SHADING_MODE_EXPORTER_CONTEXT_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/shadingModeImporter.cpp b/plugin/pxr/maya/lib/usdMaya/shadingModeImporter.cpp similarity index 81% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/shadingModeImporter.cpp rename to plugin/pxr/maya/lib/usdMaya/shadingModeImporter.cpp index 66e2700182..12e992c3ee 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/shadingModeImporter.cpp +++ b/plugin/pxr/maya/lib/usdMaya/shadingModeImporter.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/shadingModeImporter.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/shadingModeImporter.h b/plugin/pxr/maya/lib/usdMaya/shadingModeImporter.h similarity index 83% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/shadingModeImporter.h rename to plugin/pxr/maya/lib/usdMaya/shadingModeImporter.h index 75b408c175..62f2af792b 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/shadingModeImporter.h +++ b/plugin/pxr/maya/lib/usdMaya/shadingModeImporter.h @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYA_SHADING_MODE_IMPORTER_H #define PXRUSDMAYA_SHADING_MODE_IMPORTER_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/shadingModePxrRis.cpp b/plugin/pxr/maya/lib/usdMaya/shadingModePxrRis.cpp similarity index 95% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/shadingModePxrRis.cpp rename to plugin/pxr/maya/lib/usdMaya/shadingModePxrRis.cpp index cd5e087379..0e0188c25a 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/shadingModePxrRis.cpp +++ b/plugin/pxr/maya/lib/usdMaya/shadingModePxrRis.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/roundTripUtil.h" #include "usdMaya/shadingModeExporter.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/shadingModePxrRis_rfm_map.h b/plugin/pxr/maya/lib/usdMaya/shadingModePxrRis_rfm_map.h similarity index 84% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/shadingModePxrRis_rfm_map.h rename to plugin/pxr/maya/lib/usdMaya/shadingModePxrRis_rfm_map.h index 3d34b0ca79..817d23b4e3 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/shadingModePxrRis_rfm_map.h +++ b/plugin/pxr/maya/lib/usdMaya/shadingModePxrRis_rfm_map.h @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // // This table comes from RenderMan for Maya version 20.1 // The software does under the hood transformation implementing some Maya native shader nodes diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/shadingModeRegistry.cpp b/plugin/pxr/maya/lib/usdMaya/shadingModeRegistry.cpp similarity index 79% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/shadingModeRegistry.cpp rename to plugin/pxr/maya/lib/usdMaya/shadingModeRegistry.cpp index d2e97ee627..f35a8f3c13 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/shadingModeRegistry.cpp +++ b/plugin/pxr/maya/lib/usdMaya/shadingModeRegistry.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/shadingModeRegistry.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/shadingModeRegistry.h b/plugin/pxr/maya/lib/usdMaya/shadingModeRegistry.h similarity index 75% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/shadingModeRegistry.h rename to plugin/pxr/maya/lib/usdMaya/shadingModeRegistry.h index 80b50cf634..84b11c9b83 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/shadingModeRegistry.h +++ b/plugin/pxr/maya/lib/usdMaya/shadingModeRegistry.h @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYA_SHADING_MODE_REGISTRY_H #define PXRUSDMAYA_SHADING_MODE_REGISTRY_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/shadingModeUseRegistry.cpp b/plugin/pxr/maya/lib/usdMaya/shadingModeUseRegistry.cpp similarity index 94% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/shadingModeUseRegistry.cpp rename to plugin/pxr/maya/lib/usdMaya/shadingModeUseRegistry.cpp index b94b47957c..709a63d755 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/shadingModeUseRegistry.cpp +++ b/plugin/pxr/maya/lib/usdMaya/shadingModeUseRegistry.cpp @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxr/pxr.h" #include "usdMaya/primWriter.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/shadingUtil.cpp b/plugin/pxr/maya/lib/usdMaya/shadingUtil.cpp similarity index 64% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/shadingUtil.cpp rename to plugin/pxr/maya/lib/usdMaya/shadingUtil.cpp index 77f950aa00..5b8c26b0de 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/shadingUtil.cpp +++ b/plugin/pxr/maya/lib/usdMaya/shadingUtil.cpp @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxr/pxr.h" #include "usdMaya/shadingUtil.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/shadingUtil.h b/plugin/pxr/maya/lib/usdMaya/shadingUtil.h similarity index 70% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/shadingUtil.h rename to plugin/pxr/maya/lib/usdMaya/shadingUtil.h index 9728162e06..4945137580 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/shadingUtil.h +++ b/plugin/pxr/maya/lib/usdMaya/shadingUtil.h @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYA_SHADING_UTIL_H #define PXRUSDMAYA_SHADING_UTIL_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/skelBindingsProcessor.cpp b/plugin/pxr/maya/lib/usdMaya/skelBindingsProcessor.cpp similarity index 86% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/skelBindingsProcessor.cpp rename to plugin/pxr/maya/lib/usdMaya/skelBindingsProcessor.cpp index dd46d38bd7..6649ecfd5c 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/skelBindingsProcessor.cpp +++ b/plugin/pxr/maya/lib/usdMaya/skelBindingsProcessor.cpp @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/skelBindingsProcessor.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/skelBindingsProcessor.h b/plugin/pxr/maya/lib/usdMaya/skelBindingsProcessor.h similarity index 64% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/skelBindingsProcessor.h rename to plugin/pxr/maya/lib/usdMaya/skelBindingsProcessor.h index e2415b9ca8..de787b3cf1 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/skelBindingsProcessor.h +++ b/plugin/pxr/maya/lib/usdMaya/skelBindingsProcessor.h @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYA_SKEL_BINDINGS_PROCESSOR_H #define PXRUSDMAYA_SKEL_BINDINGS_PROCESSOR_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/stageCache.cpp b/plugin/pxr/maya/lib/usdMaya/stageCache.cpp similarity index 80% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/stageCache.cpp rename to plugin/pxr/maya/lib/usdMaya/stageCache.cpp index 04b51789b3..a41c39a379 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/stageCache.cpp +++ b/plugin/pxr/maya/lib/usdMaya/stageCache.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/stageCache.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/stageCache.h b/plugin/pxr/maya/lib/usdMaya/stageCache.h similarity index 62% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/stageCache.h rename to plugin/pxr/maya/lib/usdMaya/stageCache.h index ddf62e4ac5..99cd23e0f3 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/stageCache.h +++ b/plugin/pxr/maya/lib/usdMaya/stageCache.h @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYA_STAGECACHE_H #define PXRUSDMAYA_STAGECACHE_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/stageData.cpp b/plugin/pxr/maya/lib/usdMaya/stageData.cpp similarity index 69% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/stageData.cpp rename to plugin/pxr/maya/lib/usdMaya/stageData.cpp index 4ce21f08ef..782c48cf74 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/stageData.cpp +++ b/plugin/pxr/maya/lib/usdMaya/stageData.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/stageData.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/stageData.h b/plugin/pxr/maya/lib/usdMaya/stageData.h similarity index 69% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/stageData.h rename to plugin/pxr/maya/lib/usdMaya/stageData.h index 96af41e4cf..ac1a388614 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/stageData.h +++ b/plugin/pxr/maya/lib/usdMaya/stageData.h @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYA_STAGE_DATA_H #define PXRUSDMAYA_STAGE_DATA_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/stageNode.cpp b/plugin/pxr/maya/lib/usdMaya/stageNode.cpp similarity index 83% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/stageNode.cpp rename to plugin/pxr/maya/lib/usdMaya/stageNode.cpp index 93ff517771..60fe4a198d 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/stageNode.cpp +++ b/plugin/pxr/maya/lib/usdMaya/stageNode.cpp @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/stageNode.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/stageNode.h b/plugin/pxr/maya/lib/usdMaya/stageNode.h similarity index 70% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/stageNode.h rename to plugin/pxr/maya/lib/usdMaya/stageNode.h index c058c7b0fd..f170b54d25 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/stageNode.h +++ b/plugin/pxr/maya/lib/usdMaya/stageNode.h @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYA_STAGE_NODE_H #define PXRUSDMAYA_STAGE_NODE_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/stageNoticeListener.cpp b/plugin/pxr/maya/lib/usdMaya/stageNoticeListener.cpp similarity index 67% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/stageNoticeListener.cpp rename to plugin/pxr/maya/lib/usdMaya/stageNoticeListener.cpp index 564ce95378..11b95c539e 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/stageNoticeListener.cpp +++ b/plugin/pxr/maya/lib/usdMaya/stageNoticeListener.cpp @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/stageNoticeListener.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/stageNoticeListener.h b/plugin/pxr/maya/lib/usdMaya/stageNoticeListener.h similarity index 70% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/stageNoticeListener.h rename to plugin/pxr/maya/lib/usdMaya/stageNoticeListener.h index 219e334b1e..071b26ed8d 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/stageNoticeListener.h +++ b/plugin/pxr/maya/lib/usdMaya/stageNoticeListener.h @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYA_STAGE_NOTICE_LISTENER_H #define PXRUSDMAYA_STAGE_NOTICE_LISTENER_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/PointBasedDeformerNodeTest/DeformingCube.usda b/plugin/pxr/maya/lib/usdMaya/testenv/PointBasedDeformerNodeTest/DeformingCube.usda similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/PointBasedDeformerNodeTest/DeformingCube.usda rename to plugin/pxr/maya/lib/usdMaya/testenv/PointBasedDeformerNodeTest/DeformingCube.usda diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportAsClipTest/UsdExportAsClipTest.ma b/plugin/pxr/maya/lib/usdMaya/testenv/UsdExportAsClipTest/UsdExportAsClipTest.ma similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportAsClipTest/UsdExportAsClipTest.ma rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdExportAsClipTest/UsdExportAsClipTest.ma diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportAssemblyTest/AssemblyTest.ma b/plugin/pxr/maya/lib/usdMaya/testenv/UsdExportAssemblyTest/AssemblyTest.ma similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportAssemblyTest/AssemblyTest.ma rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdExportAssemblyTest/AssemblyTest.ma diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportAssemblyTest/DummyModel.usda b/plugin/pxr/maya/lib/usdMaya/testenv/UsdExportAssemblyTest/DummyModel.usda similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportAssemblyTest/DummyModel.usda rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdExportAssemblyTest/DummyModel.usda diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportAssemblyTest/XformOpModel.usda b/plugin/pxr/maya/lib/usdMaya/testenv/UsdExportAssemblyTest/XformOpModel.usda similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportAssemblyTest/XformOpModel.usda rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdExportAssemblyTest/XformOpModel.usda diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportCameraTest/UsdExportCameraTest.ma b/plugin/pxr/maya/lib/usdMaya/testenv/UsdExportCameraTest/UsdExportCameraTest.ma similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportCameraTest/UsdExportCameraTest.ma rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdExportCameraTest/UsdExportCameraTest.ma diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportColorSetsTest/UsdExportColorSetsTest.ma b/plugin/pxr/maya/lib/usdMaya/testenv/UsdExportColorSetsTest/UsdExportColorSetsTest.ma similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportColorSetsTest/UsdExportColorSetsTest.ma rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdExportColorSetsTest/UsdExportColorSetsTest.ma diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportConnectedTest/visibility.ma b/plugin/pxr/maya/lib/usdMaya/testenv/UsdExportConnectedTest/visibility.ma similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportConnectedTest/visibility.ma rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdExportConnectedTest/visibility.ma diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportDisplayColorTest/UsdExportDisplayColorTest.ma b/plugin/pxr/maya/lib/usdMaya/testenv/UsdExportDisplayColorTest/UsdExportDisplayColorTest.ma similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportDisplayColorTest/UsdExportDisplayColorTest.ma rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdExportDisplayColorTest/UsdExportDisplayColorTest.ma diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportEulerFilterTest/UsdExportEulerFilterTest.ma b/plugin/pxr/maya/lib/usdMaya/testenv/UsdExportEulerFilterTest/UsdExportEulerFilterTest.ma similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportEulerFilterTest/UsdExportEulerFilterTest.ma rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdExportEulerFilterTest/UsdExportEulerFilterTest.ma diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportFilterTypesTest/UsdExportFilterTypesTest.ma b/plugin/pxr/maya/lib/usdMaya/testenv/UsdExportFilterTypesTest/UsdExportFilterTypesTest.ma similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportFilterTypesTest/UsdExportFilterTypesTest.ma rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdExportFilterTypesTest/UsdExportFilterTypesTest.ma diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportFrameOffsetTest/UsdExportFrameOffsetTest.ma b/plugin/pxr/maya/lib/usdMaya/testenv/UsdExportFrameOffsetTest/UsdExportFrameOffsetTest.ma similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportFrameOffsetTest/UsdExportFrameOffsetTest.ma rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdExportFrameOffsetTest/UsdExportFrameOffsetTest.ma diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportInstancesTest/UsdExportInstancesTest.ma b/plugin/pxr/maya/lib/usdMaya/testenv/UsdExportInstancesTest/UsdExportInstancesTest.ma similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportInstancesTest/UsdExportInstancesTest.ma rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdExportInstancesTest/UsdExportInstancesTest.ma diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportLocatorTest/CubeUnderLocator.ma b/plugin/pxr/maya/lib/usdMaya/testenv/UsdExportLocatorTest/CubeUnderLocator.ma similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportLocatorTest/CubeUnderLocator.ma rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdExportLocatorTest/CubeUnderLocator.ma diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportLocatorTest/SingleLocator.ma b/plugin/pxr/maya/lib/usdMaya/testenv/UsdExportLocatorTest/SingleLocator.ma similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportLocatorTest/SingleLocator.ma rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdExportLocatorTest/SingleLocator.ma diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportMeshTest/UsdExportMeshTest.ma b/plugin/pxr/maya/lib/usdMaya/testenv/UsdExportMeshTest/UsdExportMeshTest.ma similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportMeshTest/UsdExportMeshTest.ma rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdExportMeshTest/UsdExportMeshTest.ma diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportNurbsCurveTest/UsdExportNurbsCurveTest.ma b/plugin/pxr/maya/lib/usdMaya/testenv/UsdExportNurbsCurveTest/UsdExportNurbsCurveTest.ma similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportNurbsCurveTest/UsdExportNurbsCurveTest.ma rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdExportNurbsCurveTest/UsdExportNurbsCurveTest.ma diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportOverImportTest/CubeModel.usda b/plugin/pxr/maya/lib/usdMaya/testenv/UsdExportOverImportTest/CubeModel.usda similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportOverImportTest/CubeModel.usda rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdExportOverImportTest/CubeModel.usda diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportPackage/BaseModel.usda b/plugin/pxr/maya/lib/usdMaya/testenv/UsdExportPackage/BaseModel.usda similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportPackage/BaseModel.usda rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdExportPackage/BaseModel.usda diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportPackage/PackageTest.ma b/plugin/pxr/maya/lib/usdMaya/testenv/UsdExportPackage/PackageTest.ma similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportPackage/PackageTest.ma rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdExportPackage/PackageTest.ma diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportPackage/ReferenceModel.usda b/plugin/pxr/maya/lib/usdMaya/testenv/UsdExportPackage/ReferenceModel.usda similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportPackage/ReferenceModel.usda rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdExportPackage/ReferenceModel.usda diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportPackage/card.png b/plugin/pxr/maya/lib/usdMaya/testenv/UsdExportPackage/card.png similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportPackage/card.png rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdExportPackage/card.png diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportParentScopeTest/UsdExportParentScopeTest.ma b/plugin/pxr/maya/lib/usdMaya/testenv/UsdExportParentScopeTest/UsdExportParentScopeTest.ma similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportParentScopeTest/UsdExportParentScopeTest.ma rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdExportParentScopeTest/UsdExportParentScopeTest.ma diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportParticlesTest/UsdExportParticlesTest.ma b/plugin/pxr/maya/lib/usdMaya/testenv/UsdExportParticlesTest/UsdExportParticlesTest.ma similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportParticlesTest/UsdExportParticlesTest.ma rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdExportParticlesTest/UsdExportParticlesTest.ma diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportPointInstancerTest/Cone.usda b/plugin/pxr/maya/lib/usdMaya/testenv/UsdExportPointInstancerTest/Cone.usda similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportPointInstancerTest/Cone.usda rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdExportPointInstancerTest/Cone.usda diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportPointInstancerTest/InstancerTest.ma b/plugin/pxr/maya/lib/usdMaya/testenv/UsdExportPointInstancerTest/InstancerTest.ma similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportPointInstancerTest/InstancerTest.ma rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdExportPointInstancerTest/InstancerTest.ma diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportPointInstancerTest/InstancerTestMash.ma b/plugin/pxr/maya/lib/usdMaya/testenv/UsdExportPointInstancerTest/InstancerTestMash.ma similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportPointInstancerTest/InstancerTestMash.ma rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdExportPointInstancerTest/InstancerTestMash.ma diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportPrefTest/UsdExportPrefTest.ma b/plugin/pxr/maya/lib/usdMaya/testenv/UsdExportPrefTest/UsdExportPrefTest.ma similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportPrefTest/UsdExportPrefTest.ma rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdExportPrefTest/UsdExportPrefTest.ma diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportRenderLayerModeTest/UsdExportRenderLayerModeTest.ma b/plugin/pxr/maya/lib/usdMaya/testenv/UsdExportRenderLayerModeTest/UsdExportRenderLayerModeTest.ma similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportRenderLayerModeTest/UsdExportRenderLayerModeTest.ma rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdExportRenderLayerModeTest/UsdExportRenderLayerModeTest.ma diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportRfMLightTest/RfMLightsTest.ma b/plugin/pxr/maya/lib/usdMaya/testenv/UsdExportRfMLightTest/RfMLightsTest.ma similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportRfMLightTest/RfMLightsTest.ma rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdExportRfMLightTest/RfMLightsTest.ma diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportSelectionTest/UsdExportSelectionTest.ma b/plugin/pxr/maya/lib/usdMaya/testenv/UsdExportSelectionTest/UsdExportSelectionTest.ma similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportSelectionTest/UsdExportSelectionTest.ma rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdExportSelectionTest/UsdExportSelectionTest.ma diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportShadingInstancedTest/InstancedShading.ma b/plugin/pxr/maya/lib/usdMaya/testenv/UsdExportShadingInstancedTest/InstancedShading.ma similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportShadingInstancedTest/InstancedShading.ma rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdExportShadingInstancedTest/InstancedShading.ma diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportShadingInstancedTest/NestedInstancedShading.ma b/plugin/pxr/maya/lib/usdMaya/testenv/UsdExportShadingInstancedTest/NestedInstancedShading.ma similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportShadingInstancedTest/NestedInstancedShading.ma rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdExportShadingInstancedTest/NestedInstancedShading.ma diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportShadingModeDisplayColor/RedCube.ma b/plugin/pxr/maya/lib/usdMaya/testenv/UsdExportShadingModeDisplayColor/RedCube.ma similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportShadingModeDisplayColor/RedCube.ma rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdExportShadingModeDisplayColor/RedCube.ma diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportShadingModePxrRis/MarbleCube.ma b/plugin/pxr/maya/lib/usdMaya/testenv/UsdExportShadingModePxrRis/MarbleCube.ma similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportShadingModePxrRis/MarbleCube.ma rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdExportShadingModePxrRis/MarbleCube.ma diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportSkeletonTest/UsdExportSkeleton.ma b/plugin/pxr/maya/lib/usdMaya/testenv/UsdExportSkeletonTest/UsdExportSkeleton.ma similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportSkeletonTest/UsdExportSkeleton.ma rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdExportSkeletonTest/UsdExportSkeleton.ma diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportSkeletonTest/UsdExportSkeletonAtSceneRoot.ma b/plugin/pxr/maya/lib/usdMaya/testenv/UsdExportSkeletonTest/UsdExportSkeletonAtSceneRoot.ma similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportSkeletonTest/UsdExportSkeletonAtSceneRoot.ma rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdExportSkeletonTest/UsdExportSkeletonAtSceneRoot.ma diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportSkeletonTest/UsdExportSkeletonWithoutBindPose.ma b/plugin/pxr/maya/lib/usdMaya/testenv/UsdExportSkeletonTest/UsdExportSkeletonWithoutBindPose.ma similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportSkeletonTest/UsdExportSkeletonWithoutBindPose.ma rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdExportSkeletonTest/UsdExportSkeletonWithoutBindPose.ma diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportSkeletonTest/baseline/UsdExportSkeletonWithoutBindPose.usda b/plugin/pxr/maya/lib/usdMaya/testenv/UsdExportSkeletonTest/baseline/UsdExportSkeletonWithoutBindPose.usda similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportSkeletonTest/baseline/UsdExportSkeletonWithoutBindPose.usda rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdExportSkeletonTest/baseline/UsdExportSkeletonWithoutBindPose.usda diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportUVSetsFloatTest/UsdExportUVSetsTest_Float.ma b/plugin/pxr/maya/lib/usdMaya/testenv/UsdExportUVSetsFloatTest/UsdExportUVSetsTest_Float.ma similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportUVSetsFloatTest/UsdExportUVSetsTest_Float.ma rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdExportUVSetsFloatTest/UsdExportUVSetsTest_Float.ma diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportUVSetsTest/UsdExportUVSetsTest.ma b/plugin/pxr/maya/lib/usdMaya/testenv/UsdExportUVSetsTest/UsdExportUVSetsTest.ma similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportUVSetsTest/UsdExportUVSetsTest.ma rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdExportUVSetsTest/UsdExportUVSetsTest.ma diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportVisibilityDefaultTest/UsdExportVisibilityDefaultTest.ma b/plugin/pxr/maya/lib/usdMaya/testenv/UsdExportVisibilityDefaultTest/UsdExportVisibilityDefaultTest.ma similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdExportVisibilityDefaultTest/UsdExportVisibilityDefaultTest.ma rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdExportVisibilityDefaultTest/UsdExportVisibilityDefaultTest.ma diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdImportAsAssemblies/CubeModel.usda b/plugin/pxr/maya/lib/usdMaya/testenv/UsdImportAsAssemblies/CubeModel.usda similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdImportAsAssemblies/CubeModel.usda rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdImportAsAssemblies/CubeModel.usda diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdImportAsAssemblies/Cubes_set.usda b/plugin/pxr/maya/lib/usdMaya/testenv/UsdImportAsAssemblies/Cubes_set.usda similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdImportAsAssemblies/Cubes_set.usda rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdImportAsAssemblies/Cubes_set.usda diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdImportCameraTest/UsdImportCameraTest.usda b/plugin/pxr/maya/lib/usdMaya/testenv/UsdImportCameraTest/UsdImportCameraTest.usda similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdImportCameraTest/UsdImportCameraTest.usda rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdImportCameraTest/UsdImportCameraTest.usda diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdImportColorSetsTest/UsdImportColorSetsTest.usda b/plugin/pxr/maya/lib/usdMaya/testenv/UsdImportColorSetsTest/UsdImportColorSetsTest.usda similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdImportColorSetsTest/UsdImportColorSetsTest.usda rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdImportColorSetsTest/UsdImportColorSetsTest.usda diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdImportFrameRangeTest/MovingCube.usda b/plugin/pxr/maya/lib/usdMaya/testenv/UsdImportFrameRangeTest/MovingCube.usda similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdImportFrameRangeTest/MovingCube.usda rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdImportFrameRangeTest/MovingCube.usda diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdImportMeshTest/Mesh.usda b/plugin/pxr/maya/lib/usdMaya/testenv/UsdImportMeshTest/Mesh.usda similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdImportMeshTest/Mesh.usda rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdImportMeshTest/Mesh.usda diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdImportNestedAssemblyAnimationTest/AnimatedCubeModel.usda b/plugin/pxr/maya/lib/usdMaya/testenv/UsdImportNestedAssemblyAnimationTest/AnimatedCubeModel.usda similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdImportNestedAssemblyAnimationTest/AnimatedCubeModel.usda rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdImportNestedAssemblyAnimationTest/AnimatedCubeModel.usda diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdImportNestedAssemblyAnimationTest/AnimationLayer.usda b/plugin/pxr/maya/lib/usdMaya/testenv/UsdImportNestedAssemblyAnimationTest/AnimationLayer.usda similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdImportNestedAssemblyAnimationTest/AnimationLayer.usda rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdImportNestedAssemblyAnimationTest/AnimationLayer.usda diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdImportNestedAssemblyAnimationTest/CubeModel.usda b/plugin/pxr/maya/lib/usdMaya/testenv/UsdImportNestedAssemblyAnimationTest/CubeModel.usda similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdImportNestedAssemblyAnimationTest/CubeModel.usda rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdImportNestedAssemblyAnimationTest/CubeModel.usda diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdImportNestedAssemblyAnimationTest/Cube_set.usda b/plugin/pxr/maya/lib/usdMaya/testenv/UsdImportNestedAssemblyAnimationTest/Cube_set.usda similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdImportNestedAssemblyAnimationTest/Cube_set.usda rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdImportNestedAssemblyAnimationTest/Cube_set.usda diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdImportRfMLightTest/RfMLightsTest.usda b/plugin/pxr/maya/lib/usdMaya/testenv/UsdImportRfMLightTest/RfMLightsTest.usda similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdImportRfMLightTest/RfMLightsTest.usda rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdImportRfMLightTest/RfMLightsTest.usda diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdImportSessionLayerTest/Cubes.usda b/plugin/pxr/maya/lib/usdMaya/testenv/UsdImportSessionLayerTest/Cubes.usda similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdImportSessionLayerTest/Cubes.usda rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdImportSessionLayerTest/Cubes.usda diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdImportShadingModeDisplayColor/RedCube.usda b/plugin/pxr/maya/lib/usdMaya/testenv/UsdImportShadingModeDisplayColor/RedCube.usda similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdImportShadingModeDisplayColor/RedCube.usda rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdImportShadingModeDisplayColor/RedCube.usda diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdImportShadingModePxrRis/MarbleCube.usda b/plugin/pxr/maya/lib/usdMaya/testenv/UsdImportShadingModePxrRis/MarbleCube.usda similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdImportShadingModePxrRis/MarbleCube.usda rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdImportShadingModePxrRis/MarbleCube.usda diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdImportSkeleton/skelCube.usda b/plugin/pxr/maya/lib/usdMaya/testenv/UsdImportSkeleton/skelCube.usda similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdImportSkeleton/skelCube.usda rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdImportSkeleton/skelCube.usda diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdImportUVSetsFloatTest/UsdImportUVSetsTestWithCreases_Float.usda b/plugin/pxr/maya/lib/usdMaya/testenv/UsdImportUVSetsFloatTest/UsdImportUVSetsTestWithCreases_Float.usda similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdImportUVSetsFloatTest/UsdImportUVSetsTestWithCreases_Float.usda rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdImportUVSetsFloatTest/UsdImportUVSetsTestWithCreases_Float.usda diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdImportUVSetsFloatTest/UsdImportUVSetsTest_Float.usda b/plugin/pxr/maya/lib/usdMaya/testenv/UsdImportUVSetsFloatTest/UsdImportUVSetsTest_Float.usda similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdImportUVSetsFloatTest/UsdImportUVSetsTest_Float.usda rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdImportUVSetsFloatTest/UsdImportUVSetsTest_Float.usda diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdImportUVSetsTest/UsdImportUVSetsTest.usda b/plugin/pxr/maya/lib/usdMaya/testenv/UsdImportUVSetsTest/UsdImportUVSetsTest.usda similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdImportUVSetsTest/UsdImportUVSetsTest.usda rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdImportUVSetsTest/UsdImportUVSetsTest.usda diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdImportUVSetsTest/UsdImportUVSetsTestWithCreases.usda b/plugin/pxr/maya/lib/usdMaya/testenv/UsdImportUVSetsTest/UsdImportUVSetsTestWithCreases.usda similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdImportUVSetsTest/UsdImportUVSetsTestWithCreases.usda rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdImportUVSetsTest/UsdImportUVSetsTestWithCreases.usda diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdImportXformsTest/UsdImportXformsTest.usda b/plugin/pxr/maya/lib/usdMaya/testenv/UsdImportXformsTest/UsdImportXformsTest.usda similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdImportXformsTest/UsdImportXformsTest.usda rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdImportXformsTest/UsdImportXformsTest.usda diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdImportXformsTest/UsdImportXformsTestRotateAxis.usda b/plugin/pxr/maya/lib/usdMaya/testenv/UsdImportXformsTest/UsdImportXformsTestRotateAxis.usda similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdImportXformsTest/UsdImportXformsTestRotateAxis.usda rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdImportXformsTest/UsdImportXformsTestRotateAxis.usda diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdImportXformsTest/pivotTests.usda b/plugin/pxr/maya/lib/usdMaya/testenv/UsdImportXformsTest/pivotTests.usda similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdImportXformsTest/pivotTests.usda rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdImportXformsTest/pivotTests.usda diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdMayaAdaptorGeomTest/UsdAttrs.usda b/plugin/pxr/maya/lib/usdMaya/testenv/UsdMayaAdaptorGeomTest/UsdAttrs.usda similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdMayaAdaptorGeomTest/UsdAttrs.usda rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdMayaAdaptorGeomTest/UsdAttrs.usda diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdMayaAdaptorMetadataTest/UsdAttrs.usda b/plugin/pxr/maya/lib/usdMaya/testenv/UsdMayaAdaptorMetadataTest/UsdAttrs.usda similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdMayaAdaptorMetadataTest/UsdAttrs.usda rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdMayaAdaptorMetadataTest/UsdAttrs.usda diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdMayaAppDirTest/maya_profile/scripts/userSetup.py b/plugin/pxr/maya/lib/usdMaya/testenv/UsdMayaAppDirTest/maya_profile/scripts/userSetup.py similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdMayaAppDirTest/maya_profile/scripts/userSetup.py rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdMayaAppDirTest/maya_profile/scripts/userSetup.py diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdMayaGetVariantSetSelectionsTest/CubeWithVariantsModel.usda b/plugin/pxr/maya/lib/usdMaya/testenv/UsdMayaGetVariantSetSelectionsTest/CubeWithVariantsModel.usda similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdMayaGetVariantSetSelectionsTest/CubeWithVariantsModel.usda rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdMayaGetVariantSetSelectionsTest/CubeWithVariantsModel.usda diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdMayaModelKindProcessorTest/KindTest.ma b/plugin/pxr/maya/lib/usdMaya/testenv/UsdMayaModelKindProcessorTest/KindTest.ma similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdMayaModelKindProcessorTest/KindTest.ma rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdMayaModelKindProcessorTest/KindTest.ma diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdMayaModelKindProcessorTest/KindTest.usd b/plugin/pxr/maya/lib/usdMaya/testenv/UsdMayaModelKindProcessorTest/KindTest.usd similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdMayaModelKindProcessorTest/KindTest.usd rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdMayaModelKindProcessorTest/KindTest.usd diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdMayaModelKindProcessorTest/KindTestAssembly.ma b/plugin/pxr/maya/lib/usdMaya/testenv/UsdMayaModelKindProcessorTest/KindTestAssembly.ma similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdMayaModelKindProcessorTest/KindTestAssembly.ma rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdMayaModelKindProcessorTest/KindTestAssembly.ma diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdMayaModelKindProcessorTest/KindTestAssemblyAndMesh.ma b/plugin/pxr/maya/lib/usdMaya/testenv/UsdMayaModelKindProcessorTest/KindTestAssemblyAndMesh.ma similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdMayaModelKindProcessorTest/KindTestAssemblyAndMesh.ma rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdMayaModelKindProcessorTest/KindTestAssemblyAndMesh.ma diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdMayaModelKindProcessorTest/KindTestUsdKindAttr.ma b/plugin/pxr/maya/lib/usdMaya/testenv/UsdMayaModelKindProcessorTest/KindTestUsdKindAttr.ma similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdMayaModelKindProcessorTest/KindTestUsdKindAttr.ma rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdMayaModelKindProcessorTest/KindTestUsdKindAttr.ma diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdMayaProxyShape/CubeModel.usda b/plugin/pxr/maya/lib/usdMaya/testenv/UsdMayaProxyShape/CubeModel.usda similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdMayaProxyShape/CubeModel.usda rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdMayaProxyShape/CubeModel.usda diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdMayaProxyShape/ProxyShape.ma b/plugin/pxr/maya/lib/usdMaya/testenv/UsdMayaProxyShape/ProxyShape.ma similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdMayaProxyShape/ProxyShape.ma rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdMayaProxyShape/ProxyShape.ma diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdMayaReferenceAssemblyEdits/CubeModel.usda b/plugin/pxr/maya/lib/usdMaya/testenv/UsdMayaReferenceAssemblyEdits/CubeModel.usda similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdMayaReferenceAssemblyEdits/CubeModel.usda rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdMayaReferenceAssemblyEdits/CubeModel.usda diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdMayaUserExportedAttributesTest/UserExportedAttributesTest.ma b/plugin/pxr/maya/lib/usdMaya/testenv/UsdMayaUserExportedAttributesTest/UserExportedAttributesTest.ma similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdMayaUserExportedAttributesTest/UserExportedAttributesTest.ma rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdMayaUserExportedAttributesTest/UserExportedAttributesTest.ma diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdReferenceAssemblyChangeRepresentationsTest/ComplexSet.usda b/plugin/pxr/maya/lib/usdMaya/testenv/UsdReferenceAssemblyChangeRepresentationsTest/ComplexSet.usda similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdReferenceAssemblyChangeRepresentationsTest/ComplexSet.usda rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdReferenceAssemblyChangeRepresentationsTest/ComplexSet.usda diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdReferenceAssemblyChangeRepresentationsTest/CubeModel.usda b/plugin/pxr/maya/lib/usdMaya/testenv/UsdReferenceAssemblyChangeRepresentationsTest/CubeModel.usda similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdReferenceAssemblyChangeRepresentationsTest/CubeModel.usda rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdReferenceAssemblyChangeRepresentationsTest/CubeModel.usda diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdReferenceAssemblyChangeRepresentationsTest/CubeModel_NoDefaultPrim.usda b/plugin/pxr/maya/lib/usdMaya/testenv/UsdReferenceAssemblyChangeRepresentationsTest/CubeModel_NoDefaultPrim.usda similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdReferenceAssemblyChangeRepresentationsTest/CubeModel_NoDefaultPrim.usda rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdReferenceAssemblyChangeRepresentationsTest/CubeModel_NoDefaultPrim.usda diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdReferenceAssemblyChangeRepresentationsTest/OneCube_set.usda b/plugin/pxr/maya/lib/usdMaya/testenv/UsdReferenceAssemblyChangeRepresentationsTest/OneCube_set.usda similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdReferenceAssemblyChangeRepresentationsTest/OneCube_set.usda rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdReferenceAssemblyChangeRepresentationsTest/OneCube_set.usda diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdReferenceAssemblyChangeRepresentationsTest/SetWithModelingVariants_set.usda b/plugin/pxr/maya/lib/usdMaya/testenv/UsdReferenceAssemblyChangeRepresentationsTest/SetWithModelingVariants_set.usda similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdReferenceAssemblyChangeRepresentationsTest/SetWithModelingVariants_set.usda rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdReferenceAssemblyChangeRepresentationsTest/SetWithModelingVariants_set.usda diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdReferenceAssemblyChangeRepresentationsTest/TwoCubes_set.usda b/plugin/pxr/maya/lib/usdMaya/testenv/UsdReferenceAssemblyChangeRepresentationsTest/TwoCubes_set.usda similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdReferenceAssemblyChangeRepresentationsTest/TwoCubes_set.usda rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdReferenceAssemblyChangeRepresentationsTest/TwoCubes_set.usda diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdReferenceAssemblySelectionTest/CubeModel.usda b/plugin/pxr/maya/lib/usdMaya/testenv/UsdReferenceAssemblySelectionTest/CubeModel.usda similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdReferenceAssemblySelectionTest/CubeModel.usda rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdReferenceAssemblySelectionTest/CubeModel.usda diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdReferenceAssemblySelectionTest/UsdReferenceAssemblySelectionTest.ma b/plugin/pxr/maya/lib/usdMaya/testenv/UsdReferenceAssemblySelectionTest/UsdReferenceAssemblySelectionTest.ma similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdReferenceAssemblySelectionTest/UsdReferenceAssemblySelectionTest.ma rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdReferenceAssemblySelectionTest/UsdReferenceAssemblySelectionTest.ma diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdTranslateTypelessDefs/ExoticTypeNames.usda b/plugin/pxr/maya/lib/usdMaya/testenv/UsdTranslateTypelessDefs/ExoticTypeNames.usda similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/UsdTranslateTypelessDefs/ExoticTypeNames.usda rename to plugin/pxr/maya/lib/usdMaya/testenv/UsdTranslateTypelessDefs/ExoticTypeNames.usda diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testPointBasedDeformerNode.py b/plugin/pxr/maya/lib/usdMaya/testenv/testPointBasedDeformerNode.py similarity index 80% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testPointBasedDeformerNode.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testPointBasedDeformerNode.py index d0ce1ca6d6..d4a7a4589b 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testPointBasedDeformerNode.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testPointBasedDeformerNode.py @@ -2,25 +2,17 @@ # # Copyright 2018 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # import os diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportAsClip.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportAsClip.py similarity index 85% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportAsClip.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportAsClip.py index 5642fb537f..3483682402 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportAsClip.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportAsClip.py @@ -2,25 +2,17 @@ # # Copyright 2016 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # import os import unittest diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportAssembly.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportAssembly.py similarity index 78% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportAssembly.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportAssembly.py index 656bac8f8c..59253ba18d 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportAssembly.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportAssembly.py @@ -2,25 +2,17 @@ # # Copyright 2016 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # import os diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportCamera.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportCamera.py similarity index 93% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportCamera.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportCamera.py index ec75a385fa..08631f77c4 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportCamera.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportCamera.py @@ -2,25 +2,17 @@ # # Copyright 2016 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # import os diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportColorSets.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportColorSets.py similarity index 96% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportColorSets.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportColorSets.py index 9812a5e315..0d33b311ef 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportColorSets.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportColorSets.py @@ -2,25 +2,17 @@ # # Copyright 2016 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportConnected.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportConnected.py similarity index 58% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportConnected.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportConnected.py index 9246289c9f..df7283311f 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportConnected.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportConnected.py @@ -2,25 +2,17 @@ # # Copyright 2018 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # import os diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportDisplayColor.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportDisplayColor.py similarity index 90% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportDisplayColor.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportDisplayColor.py index abb3621da8..56007d10d1 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportDisplayColor.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportDisplayColor.py @@ -2,25 +2,17 @@ # # Copyright 2016 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # import os diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportEulerFilter.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportEulerFilter.py similarity index 80% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportEulerFilter.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportEulerFilter.py index ec86b271af..ebfdb38e75 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportEulerFilter.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportEulerFilter.py @@ -2,25 +2,17 @@ # # Copyright 2018 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # import os diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportFilterTypes.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportFilterTypes.py similarity index 90% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportFilterTypes.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportFilterTypes.py index 2a8bfacf94..75c26f87d6 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportFilterTypes.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportFilterTypes.py @@ -2,25 +2,17 @@ # # Copyright 2018 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # import os diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportFrameOffset.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportFrameOffset.py similarity index 83% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportFrameOffset.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportFrameOffset.py index cf4626b6aa..9c8b886b67 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportFrameOffset.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportFrameOffset.py @@ -2,25 +2,17 @@ # # Copyright 2016 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # import os diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportInstances.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportInstances.py similarity index 81% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportInstances.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportInstances.py index 7e07b56d09..d48ef81cc9 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportInstances.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportInstances.py @@ -2,25 +2,17 @@ # # Copyright 2017 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportLocator.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportLocator.py similarity index 91% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportLocator.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportLocator.py index 5342a50e2e..6bee7e48f1 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportLocator.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportLocator.py @@ -2,25 +2,17 @@ # # Copyright 2018 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # import os diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportMesh.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportMesh.py similarity index 87% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportMesh.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportMesh.py index 5a065dbce6..234f0ec5df 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportMesh.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportMesh.py @@ -2,25 +2,17 @@ # # Copyright 2016 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # import os diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportNurbsCurve.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportNurbsCurve.py similarity index 62% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportNurbsCurve.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportNurbsCurve.py index 982c2235b8..a167ff9499 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportNurbsCurve.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportNurbsCurve.py @@ -2,25 +2,17 @@ # # Copyright 2016 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportOpenLayer.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportOpenLayer.py similarity index 73% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportOpenLayer.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportOpenLayer.py index c75008e0f4..cf07e9d93d 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportOpenLayer.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportOpenLayer.py @@ -2,27 +2,18 @@ # # Copyright 2018 Pixar # -# Licensed under the Apache License, Version 2.0 (the 'Apache License') -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # - import os import unittest diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportOverImport.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportOverImport.py similarity index 69% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportOverImport.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportOverImport.py index 938f365fe9..60282e25f1 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportOverImport.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportOverImport.py @@ -2,25 +2,17 @@ # # Copyright 2017 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # import os diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportPackage.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportPackage.py similarity index 81% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportPackage.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportPackage.py index 01cd707970..7abe1e142e 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportPackage.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportPackage.py @@ -2,25 +2,17 @@ # # Copyright 2018 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportParentScope.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportParentScope.py similarity index 63% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportParentScope.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportParentScope.py index 3339299013..2af2dc9336 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportParentScope.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportParentScope.py @@ -2,25 +2,17 @@ # # Copyright 2018 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # import os diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportParticles.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportParticles.py similarity index 65% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportParticles.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportParticles.py index 57d4a99dbf..3e4c732203 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportParticles.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportParticles.py @@ -2,25 +2,17 @@ # # Copyright 2018 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportPointInstancer.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportPointInstancer.py similarity index 93% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportPointInstancer.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportPointInstancer.py index 47ea13534f..a31f4020aa 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportPointInstancer.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportPointInstancer.py @@ -2,25 +2,17 @@ # # Copyright 2017 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # import os diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportPref.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportPref.py similarity index 68% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportPref.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportPref.py index af9f9a70c6..b44c6f35a8 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportPref.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportPref.py @@ -2,25 +2,17 @@ # # Copyright 2018 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportRenderLayerMode.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportRenderLayerMode.py similarity index 89% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportRenderLayerMode.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportRenderLayerMode.py index 4b686233b0..d9368973a2 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportRenderLayerMode.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportRenderLayerMode.py @@ -2,25 +2,17 @@ # # Copyright 2016 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportRfMLight.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportRfMLight.py similarity index 93% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportRfMLight.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportRfMLight.py index f231c23980..55e2b99bba 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportRfMLight.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportRfMLight.py @@ -2,25 +2,17 @@ # # Copyright 2017 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # import os diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportSelection.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportSelection.py similarity index 70% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportSelection.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportSelection.py index d690b58644..cb6c992976 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportSelection.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportSelection.py @@ -2,25 +2,17 @@ # # Copyright 2016 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportShadingInstanced.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportShadingInstanced.py similarity index 88% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportShadingInstanced.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportShadingInstanced.py index dc1ce06b7a..04eadf456e 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportShadingInstanced.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportShadingInstanced.py @@ -2,25 +2,17 @@ # # Copyright 2018 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # import os diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportShadingModeDisplayColor.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportShadingModeDisplayColor.py similarity index 82% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportShadingModeDisplayColor.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportShadingModeDisplayColor.py index 07f1519ef6..c669c22b52 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportShadingModeDisplayColor.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportShadingModeDisplayColor.py @@ -2,25 +2,17 @@ # # Copyright 2017 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # from pxr import UsdMaya diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportShadingModePxrRis.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportShadingModePxrRis.py similarity index 81% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportShadingModePxrRis.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportShadingModePxrRis.py index c97e4dcfbf..aca21ddf00 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportShadingModePxrRis.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportShadingModePxrRis.py @@ -2,25 +2,17 @@ # # Copyright 2017 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # import os diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportSkeleton.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportSkeleton.py similarity index 86% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportSkeleton.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportSkeleton.py index f32be66c98..1102a3d706 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportSkeleton.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportSkeleton.py @@ -2,25 +2,17 @@ # # Copyright 2018 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # import os import unittest diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportStripNamespaces.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportStripNamespaces.py similarity index 82% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportStripNamespaces.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportStripNamespaces.py index 6a98b036a8..ea62faff2b 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportStripNamespaces.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportStripNamespaces.py @@ -2,25 +2,17 @@ # # Copyright 2016 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportUVSets.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportUVSets.py similarity index 92% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportUVSets.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportUVSets.py index a3201be75a..00142fd43c 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportUVSets.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportUVSets.py @@ -2,25 +2,17 @@ # # Copyright 2016 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # from pxr import UsdMaya diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportVisibilityDefault.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportVisibilityDefault.py similarity index 63% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportVisibilityDefault.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportVisibilityDefault.py index 917c22c7e1..dda81b26f8 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdExportVisibilityDefault.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdExportVisibilityDefault.py @@ -2,25 +2,17 @@ # # Copyright 2016 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # import os diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdImportAsAssemblies.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdImportAsAssemblies.py similarity index 88% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdImportAsAssemblies.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdImportAsAssemblies.py index f3859dfc19..7eb4e9011d 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdImportAsAssemblies.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdImportAsAssemblies.py @@ -2,25 +2,17 @@ # # Copyright 2016 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # import os diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdImportCamera.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdImportCamera.py similarity index 94% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdImportCamera.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdImportCamera.py index 3e4df95aae..3f3ba494c7 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdImportCamera.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdImportCamera.py @@ -2,25 +2,17 @@ # # Copyright 2016 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # import os diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdImportColorSets.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdImportColorSets.py similarity index 96% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdImportColorSets.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdImportColorSets.py index 15ced57539..60e6cc702a 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdImportColorSets.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdImportColorSets.py @@ -2,25 +2,17 @@ # # Copyright 2016 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # import os diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdImportFrameRange.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdImportFrameRange.py similarity index 79% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdImportFrameRange.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdImportFrameRange.py index f7378950d2..083d8ea68f 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdImportFrameRange.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdImportFrameRange.py @@ -2,25 +2,17 @@ # # Copyright 2016 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # import os diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdImportMesh.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdImportMesh.py similarity index 72% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdImportMesh.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdImportMesh.py index 772ea6362c..302ad55a61 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdImportMesh.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdImportMesh.py @@ -2,25 +2,17 @@ # # Copyright 2018 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # from pxr import UsdMaya diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdImportNestedAssemblyAnimation.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdImportNestedAssemblyAnimation.py similarity index 82% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdImportNestedAssemblyAnimation.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdImportNestedAssemblyAnimation.py index 0a08ddce2d..d77583e501 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdImportNestedAssemblyAnimation.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdImportNestedAssemblyAnimation.py @@ -2,25 +2,17 @@ # # Copyright 2016 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdImportRfMLight.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdImportRfMLight.py similarity index 93% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdImportRfMLight.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdImportRfMLight.py index c1ed42a021..87474b97ca 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdImportRfMLight.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdImportRfMLight.py @@ -2,25 +2,17 @@ # # Copyright 2017 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # import os diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdImportSessionLayer.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdImportSessionLayer.py similarity index 71% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdImportSessionLayer.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdImportSessionLayer.py index f5bd2363d0..e7a55dd288 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdImportSessionLayer.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdImportSessionLayer.py @@ -2,25 +2,17 @@ # # Copyright 2016 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # import os diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdImportShadingModeDisplayColor.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdImportShadingModeDisplayColor.py similarity index 75% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdImportShadingModeDisplayColor.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdImportShadingModeDisplayColor.py index b00fe1d35d..2d37e37bc7 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdImportShadingModeDisplayColor.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdImportShadingModeDisplayColor.py @@ -2,25 +2,17 @@ # # Copyright 2017 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # import os diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdImportShadingModePxrRis.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdImportShadingModePxrRis.py similarity index 78% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdImportShadingModePxrRis.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdImportShadingModePxrRis.py index e7b1e29f24..177b1dcc4b 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdImportShadingModePxrRis.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdImportShadingModePxrRis.py @@ -2,25 +2,17 @@ # # Copyright 2017 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # import os diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdImportSkeleton.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdImportSkeleton.py similarity index 90% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdImportSkeleton.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdImportSkeleton.py index 11eb7ac9f7..0aa7df8473 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdImportSkeleton.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdImportSkeleton.py @@ -2,25 +2,17 @@ # # Copyright 2018 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # import unittest, os from pxr import Gf, Usd, UsdSkel diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdImportUVSets.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdImportUVSets.py similarity index 93% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdImportUVSets.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdImportUVSets.py index aa6e2afc80..964e427c59 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdImportUVSets.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdImportUVSets.py @@ -2,25 +2,17 @@ # # Copyright 2016 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # from pxr import UsdMaya diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdImportXforms.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdImportXforms.py similarity index 91% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdImportXforms.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdImportXforms.py index 6862793e7d..c5e2749bac 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdImportXforms.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdImportXforms.py @@ -2,25 +2,17 @@ # # Copyright 2016 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # from pxr import Gf diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdMayaAdaptor.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdMayaAdaptor.py similarity index 93% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdMayaAdaptor.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdMayaAdaptor.py index 9845f2e283..255d7ec5de 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdMayaAdaptor.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdMayaAdaptor.py @@ -2,25 +2,17 @@ # # Copyright 2018 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # from pxr import UsdMaya diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdMayaAdaptorGeom.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdMayaAdaptorGeom.py similarity index 71% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdMayaAdaptorGeom.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdMayaAdaptorGeom.py index 341329b307..18bad08490 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdMayaAdaptorGeom.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdMayaAdaptorGeom.py @@ -2,25 +2,17 @@ # # Copyright 2018 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # from maya import cmds diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdMayaAdaptorMetadata.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdMayaAdaptorMetadata.py similarity index 90% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdMayaAdaptorMetadata.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdMayaAdaptorMetadata.py index 88af6c3c52..a7fb37c979 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdMayaAdaptorMetadata.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdMayaAdaptorMetadata.py @@ -2,25 +2,17 @@ # # Copyright 2016 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # from pxr import UsdMaya diff --git a/plugin/pxr/maya/lib/usdMaya/testenv/testUsdMayaAppDir.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdMayaAppDir.py new file mode 100644 index 0000000000..6605763d6f --- /dev/null +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdMayaAppDir.py @@ -0,0 +1,38 @@ +#!/pxrpythonsubst +# +# Copyright 2018 Pixar +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +import unittest, os + +from maya import standalone + + +class testUsdMayaAppDir(unittest.TestCase): + + @classmethod + def setUpClass(cls): + standalone.initialize('usd') + + @classmethod + def tearDownClass(cls): + standalone.uninitialize() + + def testCheckEnvVar(self): + self.assertEqual(os.environ.get('DUMMY_TEST_VAR'), 'exists') + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdMayaBlockSceneModificationContext.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdMayaBlockSceneModificationContext.py similarity index 68% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdMayaBlockSceneModificationContext.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdMayaBlockSceneModificationContext.py index 1d90a7fae0..b991d0bba6 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdMayaBlockSceneModificationContext.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdMayaBlockSceneModificationContext.py @@ -2,25 +2,17 @@ # # Copyright 2018 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # from pxr import UsdMaya diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdMayaDiagnosticDelegate.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdMayaDiagnosticDelegate.py similarity index 85% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdMayaDiagnosticDelegate.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdMayaDiagnosticDelegate.py index 1bc62e1a3d..95b148c620 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdMayaDiagnosticDelegate.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdMayaDiagnosticDelegate.py @@ -2,25 +2,17 @@ # # Copyright 2018 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # from pxr import UsdMaya diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdMayaGetVariantSetSelections.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdMayaGetVariantSetSelections.py similarity index 77% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdMayaGetVariantSetSelections.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdMayaGetVariantSetSelections.py index 2ab0ef70bd..8b3694dd54 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdMayaGetVariantSetSelections.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdMayaGetVariantSetSelections.py @@ -2,25 +2,17 @@ # # Copyright 2016 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # from pxr import UsdMaya diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdMayaModelKindProcessor.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdMayaModelKindProcessor.py similarity index 84% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdMayaModelKindProcessor.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdMayaModelKindProcessor.py index 9665743f34..9590b48fb0 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdMayaModelKindProcessor.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdMayaModelKindProcessor.py @@ -2,25 +2,17 @@ # # Copyright 2016 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # import os diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdMayaProxyShape.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdMayaProxyShape.py similarity index 73% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdMayaProxyShape.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdMayaProxyShape.py index 16c7974732..d533800c22 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdMayaProxyShape.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdMayaProxyShape.py @@ -2,25 +2,17 @@ # # Copyright 2016 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # from pxr import Usd diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdMayaReadWriteUtils.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdMayaReadWriteUtils.py similarity index 89% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdMayaReadWriteUtils.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdMayaReadWriteUtils.py index 9e302d7dda..9145ca9621 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdMayaReadWriteUtils.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdMayaReadWriteUtils.py @@ -2,25 +2,17 @@ # # Copyright 2018 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # from pxr import UsdMaya diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdMayaReferenceAssemblyEdits.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdMayaReferenceAssemblyEdits.py similarity index 85% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdMayaReferenceAssemblyEdits.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdMayaReferenceAssemblyEdits.py index 51d7d54443..b989d0ce7c 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdMayaReferenceAssemblyEdits.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdMayaReferenceAssemblyEdits.py @@ -2,25 +2,17 @@ # # Copyright 2017 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # from pxr import UsdMaya diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdMayaUserExportedAttributes.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdMayaUserExportedAttributes.py similarity index 95% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdMayaUserExportedAttributes.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdMayaUserExportedAttributes.py index 4b1e431bf8..f4698ceefc 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdMayaUserExportedAttributes.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdMayaUserExportedAttributes.py @@ -2,25 +2,17 @@ # # Copyright 2016 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # import os diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdMayaXformStack.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdMayaXformStack.py similarity index 98% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdMayaXformStack.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdMayaXformStack.py index bb1448cfea..66e8f72ef3 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdMayaXformStack.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdMayaXformStack.py @@ -2,25 +2,17 @@ # # Copyright 2017 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # from pxr import UsdMaya diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdReferenceAssemblyChangeRepresentations.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdReferenceAssemblyChangeRepresentations.py similarity index 96% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdReferenceAssemblyChangeRepresentations.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdReferenceAssemblyChangeRepresentations.py index 1f8404be4d..1494fab4e1 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdReferenceAssemblyChangeRepresentations.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdReferenceAssemblyChangeRepresentations.py @@ -2,25 +2,17 @@ # # Copyright 2016 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # from pxr import UsdMaya diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdReferenceAssemblySelection.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdReferenceAssemblySelection.py similarity index 75% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdReferenceAssemblySelection.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdReferenceAssemblySelection.py index ddee67d9bf..e2dc12b5fc 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdReferenceAssemblySelection.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdReferenceAssemblySelection.py @@ -2,25 +2,17 @@ # # Copyright 2016 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdTranslateTypelessDefs.py b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdTranslateTypelessDefs.py similarity index 82% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdTranslateTypelessDefs.py rename to plugin/pxr/maya/lib/usdMaya/testenv/testUsdTranslateTypelessDefs.py index ccb1b35c0d..cbafd49850 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdTranslateTypelessDefs.py +++ b/plugin/pxr/maya/lib/usdMaya/testenv/testUsdTranslateTypelessDefs.py @@ -2,25 +2,17 @@ # # Copyright 2018 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/transformWriter.cpp b/plugin/pxr/maya/lib/usdMaya/transformWriter.cpp similarity index 95% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/transformWriter.cpp rename to plugin/pxr/maya/lib/usdMaya/transformWriter.cpp index 3c028f2e02..ff404b0223 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/transformWriter.cpp +++ b/plugin/pxr/maya/lib/usdMaya/transformWriter.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxr/pxr.h" #include "usdMaya/transformWriter.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/transformWriter.h b/plugin/pxr/maya/lib/usdMaya/transformWriter.h similarity index 81% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/transformWriter.h rename to plugin/pxr/maya/lib/usdMaya/transformWriter.h index 41e4de1a64..c62546e36a 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/transformWriter.h +++ b/plugin/pxr/maya/lib/usdMaya/transformWriter.h @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYA_TRANSFORM_WRITER_H #define PXRUSDMAYA_TRANSFORM_WRITER_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorCamera.cpp b/plugin/pxr/maya/lib/usdMaya/translatorCamera.cpp similarity index 94% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorCamera.cpp rename to plugin/pxr/maya/lib/usdMaya/translatorCamera.cpp index f189325ccf..91d3b9115f 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorCamera.cpp +++ b/plugin/pxr/maya/lib/usdMaya/translatorCamera.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/translatorCamera.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorCamera.h b/plugin/pxr/maya/lib/usdMaya/translatorCamera.h similarity index 57% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorCamera.h rename to plugin/pxr/maya/lib/usdMaya/translatorCamera.h index b6f019e024..f18f6cc0ac 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorCamera.h +++ b/plugin/pxr/maya/lib/usdMaya/translatorCamera.h @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYA_TRANSLATOR_CAMERA_H #define PXRUSDMAYA_TRANSLATOR_CAMERA_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorCurves.cpp b/plugin/pxr/maya/lib/usdMaya/translatorCurves.cpp similarity index 91% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorCurves.cpp rename to plugin/pxr/maya/lib/usdMaya/translatorCurves.cpp index 79cc9be7c5..c7d0208670 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorCurves.cpp +++ b/plugin/pxr/maya/lib/usdMaya/translatorCurves.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/translatorCurves.h" diff --git a/plugin/pxr/maya/lib/usdMaya/translatorCurves.h b/plugin/pxr/maya/lib/usdMaya/translatorCurves.h new file mode 100644 index 0000000000..154454a74b --- /dev/null +++ b/plugin/pxr/maya/lib/usdMaya/translatorCurves.h @@ -0,0 +1,48 @@ +// +// Copyright 2016 Pixar +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +#ifndef PXRUSDMAYA_TRANSLATOR_CURVES_H +#define PXRUSDMAYA_TRANSLATOR_CURVES_H + +/// \file usdMaya/translatorCurves.h + +#include "usdMaya/api.h" +#include "usdMaya/primReaderArgs.h" +#include "usdMaya/primReaderContext.h" + +#include "pxr/pxr.h" + +#include "pxr/usd/usdGeom/curves.h" + +#include + +PXR_NAMESPACE_OPEN_SCOPE + + +/// \brief Provides helper functions for creating UsdCurves +struct UsdMayaTranslatorCurves +{ + /// \brief Creates a NurbsCurve under \p parentNode. + PXRUSDMAYA_API + static bool Create( + const UsdGeomCurves& curves, + MObject parentNode, + const UsdMayaPrimReaderArgs& args, + UsdMayaPrimReaderContext* context); +}; + +PXR_NAMESPACE_CLOSE_SCOPE + +#endif diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorGprim.cpp b/plugin/pxr/maya/lib/usdMaya/translatorGprim.cpp similarity index 64% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorGprim.cpp rename to plugin/pxr/maya/lib/usdMaya/translatorGprim.cpp index 5a5e71024b..7cad7e1d7e 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorGprim.cpp +++ b/plugin/pxr/maya/lib/usdMaya/translatorGprim.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/translatorGprim.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorGprim.h b/plugin/pxr/maya/lib/usdMaya/translatorGprim.h similarity index 50% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorGprim.h rename to plugin/pxr/maya/lib/usdMaya/translatorGprim.h index c0b28b4ac0..e752da8a12 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorGprim.h +++ b/plugin/pxr/maya/lib/usdMaya/translatorGprim.h @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYA_TRANSLATOR_GPRIM_H #define PXRUSDMAYA_TRANSLATOR_GPRIM_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorMaterial.cpp b/plugin/pxr/maya/lib/usdMaya/translatorMaterial.cpp similarity index 90% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorMaterial.cpp rename to plugin/pxr/maya/lib/usdMaya/translatorMaterial.cpp index 61478666a2..058be888cb 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorMaterial.cpp +++ b/plugin/pxr/maya/lib/usdMaya/translatorMaterial.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/translatorMaterial.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorMaterial.h b/plugin/pxr/maya/lib/usdMaya/translatorMaterial.h similarity index 68% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorMaterial.h rename to plugin/pxr/maya/lib/usdMaya/translatorMaterial.h index 0f81d8b700..381860bc59 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorMaterial.h +++ b/plugin/pxr/maya/lib/usdMaya/translatorMaterial.h @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYA_TRANSLATOR_MATERIAL_H #define PXRUSDMAYA_TRANSLATOR_MATERIAL_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorMesh.cpp b/plugin/pxr/maya/lib/usdMaya/translatorMesh.cpp similarity index 96% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorMesh.cpp rename to plugin/pxr/maya/lib/usdMaya/translatorMesh.cpp index 13ca79dc92..53aa93cda1 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorMesh.cpp +++ b/plugin/pxr/maya/lib/usdMaya/translatorMesh.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/translatorMesh.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorMesh.h b/plugin/pxr/maya/lib/usdMaya/translatorMesh.h similarity index 63% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorMesh.h rename to plugin/pxr/maya/lib/usdMaya/translatorMesh.h index 61a499f788..cc8fecbfc0 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorMesh.h +++ b/plugin/pxr/maya/lib/usdMaya/translatorMesh.h @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // /// \file usdMaya/translatorMesh.h diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorMesh_PrimVars.cpp b/plugin/pxr/maya/lib/usdMaya/translatorMesh_PrimVars.cpp similarity index 94% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorMesh_PrimVars.cpp rename to plugin/pxr/maya/lib/usdMaya/translatorMesh_PrimVars.cpp index 1d061ac901..4d342478f5 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorMesh_PrimVars.cpp +++ b/plugin/pxr/maya/lib/usdMaya/translatorMesh_PrimVars.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/translatorMesh.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorMesh_SubDiv.cpp b/plugin/pxr/maya/lib/usdMaya/translatorMesh_SubDiv.cpp similarity index 92% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorMesh_SubDiv.cpp rename to plugin/pxr/maya/lib/usdMaya/translatorMesh_SubDiv.cpp index 299ee531fd..21399f6651 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorMesh_SubDiv.cpp +++ b/plugin/pxr/maya/lib/usdMaya/translatorMesh_SubDiv.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/translatorMesh.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorModelAssembly.cpp b/plugin/pxr/maya/lib/usdMaya/translatorModelAssembly.cpp similarity index 95% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorModelAssembly.cpp rename to plugin/pxr/maya/lib/usdMaya/translatorModelAssembly.cpp index 141ba8b137..6eab294531 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorModelAssembly.cpp +++ b/plugin/pxr/maya/lib/usdMaya/translatorModelAssembly.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/translatorModelAssembly.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorModelAssembly.h b/plugin/pxr/maya/lib/usdMaya/translatorModelAssembly.h similarity index 75% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorModelAssembly.h rename to plugin/pxr/maya/lib/usdMaya/translatorModelAssembly.h index 5569783021..1e0c4076b6 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorModelAssembly.h +++ b/plugin/pxr/maya/lib/usdMaya/translatorModelAssembly.h @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYA_TRANSLATOR_MODEL_ASSEMBLY_H #define PXRUSDMAYA_TRANSLATOR_MODEL_ASSEMBLY_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorNurbsPatch.cpp b/plugin/pxr/maya/lib/usdMaya/translatorNurbsPatch.cpp similarity index 95% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorNurbsPatch.cpp rename to plugin/pxr/maya/lib/usdMaya/translatorNurbsPatch.cpp index bccc81e3a8..c569195776 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorNurbsPatch.cpp +++ b/plugin/pxr/maya/lib/usdMaya/translatorNurbsPatch.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/translatorNurbsPatch.h" diff --git a/plugin/pxr/maya/lib/usdMaya/translatorNurbsPatch.h b/plugin/pxr/maya/lib/usdMaya/translatorNurbsPatch.h new file mode 100644 index 0000000000..084aa91754 --- /dev/null +++ b/plugin/pxr/maya/lib/usdMaya/translatorNurbsPatch.h @@ -0,0 +1,49 @@ +// +// Copyright 2016 Pixar +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +#ifndef PXRUSDMAYA_TRANSLATOR_NURBSPATCH_H +#define PXRUSDMAYA_TRANSLATOR_NURBSPATCH_H + +/// \file usdMaya/translatorNurbsPatch.h + +#include "usdMaya/api.h" +#include "usdMaya/primReaderArgs.h" +#include "usdMaya/primReaderContext.h" + +#include "pxr/pxr.h" + +#include "pxr/usd/usdGeom/nurbsPatch.h" + +#include + +PXR_NAMESPACE_OPEN_SCOPE + + + +struct UsdMayaTranslatorNurbsPatch +{ + PXRUSDMAYA_API + static bool Read( + const UsdGeomNurbsPatch& usdNurbsPatch, + MObject parentNode, + const UsdMayaPrimReaderArgs& args, + UsdMayaPrimReaderContext* context); +}; + + + +PXR_NAMESPACE_CLOSE_SCOPE + +#endif diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorPrim.cpp b/plugin/pxr/maya/lib/usdMaya/translatorPrim.cpp similarity index 79% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorPrim.cpp rename to plugin/pxr/maya/lib/usdMaya/translatorPrim.cpp index 60a458e6fe..ed8b908822 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorPrim.cpp +++ b/plugin/pxr/maya/lib/usdMaya/translatorPrim.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/translatorPrim.h" diff --git a/plugin/pxr/maya/lib/usdMaya/translatorPrim.h b/plugin/pxr/maya/lib/usdMaya/translatorPrim.h new file mode 100644 index 0000000000..d6f24e167b --- /dev/null +++ b/plugin/pxr/maya/lib/usdMaya/translatorPrim.h @@ -0,0 +1,49 @@ +// +// Copyright 2016 Pixar +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +#ifndef PXRUSDMAYA_TRANSLATOR_PRIM_H +#define PXRUSDMAYA_TRANSLATOR_PRIM_H + +/// \file usdMaya/translatorPrim.h + +#include "usdMaya/api.h" +#include "usdMaya/primReaderArgs.h" +#include "usdMaya/primReaderContext.h" + +#include "pxr/pxr.h" + +#include "pxr/usd/usd/prim.h" + +#include + +PXR_NAMESPACE_OPEN_SCOPE + + +/// \brief Provides helper functions for reading UsdPrim. This should more +/// accurately take a UsdGeomImageable. +struct UsdMayaTranslatorPrim +{ + PXRUSDMAYA_API + static void Read( + const UsdPrim& prim, + MObject mayaNode, + const UsdMayaPrimReaderArgs& args, + UsdMayaPrimReaderContext* context); +}; + + +PXR_NAMESPACE_CLOSE_SCOPE + +#endif diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorRfMLight.cpp b/plugin/pxr/maya/lib/usdMaya/translatorRfMLight.cpp similarity index 98% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorRfMLight.cpp rename to plugin/pxr/maya/lib/usdMaya/translatorRfMLight.cpp index e4333a3ad5..4f513a88cf 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorRfMLight.cpp +++ b/plugin/pxr/maya/lib/usdMaya/translatorRfMLight.cpp @@ -1,25 +1,17 @@ // // Copyright 2017 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/translatorRfMLight.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorRfMLight.h b/plugin/pxr/maya/lib/usdMaya/translatorRfMLight.h similarity index 56% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorRfMLight.h rename to plugin/pxr/maya/lib/usdMaya/translatorRfMLight.h index fe8570e285..704ed1be54 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorRfMLight.h +++ b/plugin/pxr/maya/lib/usdMaya/translatorRfMLight.h @@ -1,25 +1,17 @@ // // Copyright 2017 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYA_TRANSLATOR_RFM_LIGHT_H #define PXRUSDMAYA_TRANSLATOR_RFM_LIGHT_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorSkel.cpp b/plugin/pxr/maya/lib/usdMaya/translatorSkel.cpp similarity index 98% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorSkel.cpp rename to plugin/pxr/maya/lib/usdMaya/translatorSkel.cpp index 926c3dc066..c8e99f84e2 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorSkel.cpp +++ b/plugin/pxr/maya/lib/usdMaya/translatorSkel.cpp @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/translatorSkel.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorSkel.h b/plugin/pxr/maya/lib/usdMaya/translatorSkel.h similarity index 78% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorSkel.h rename to plugin/pxr/maya/lib/usdMaya/translatorSkel.h index f78f23b954..62903368f0 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorSkel.h +++ b/plugin/pxr/maya/lib/usdMaya/translatorSkel.h @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // /// \file usdMaya/translatorSkel.h diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorUtil.cpp b/plugin/pxr/maya/lib/usdMaya/translatorUtil.cpp similarity index 88% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorUtil.cpp rename to plugin/pxr/maya/lib/usdMaya/translatorUtil.cpp index 396fd14393..1ee7e51583 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorUtil.cpp +++ b/plugin/pxr/maya/lib/usdMaya/translatorUtil.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxr/pxr.h" #include "usdMaya/translatorUtil.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorUtil.h b/plugin/pxr/maya/lib/usdMaya/translatorUtil.h similarity index 85% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorUtil.h rename to plugin/pxr/maya/lib/usdMaya/translatorUtil.h index 2f2e99395c..d165cb66f1 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorUtil.h +++ b/plugin/pxr/maya/lib/usdMaya/translatorUtil.h @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYA_TRANSLATOR_UTIL_H #define PXRUSDMAYA_TRANSLATOR_UTIL_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorXformable.cpp b/plugin/pxr/maya/lib/usdMaya/translatorXformable.cpp similarity index 94% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorXformable.cpp rename to plugin/pxr/maya/lib/usdMaya/translatorXformable.cpp index a73d18f26b..459d861c64 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorXformable.cpp +++ b/plugin/pxr/maya/lib/usdMaya/translatorXformable.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxr/pxr.h" #include "usdMaya/translatorXformable.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorXformable.h b/plugin/pxr/maya/lib/usdMaya/translatorXformable.h similarity index 57% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorXformable.h rename to plugin/pxr/maya/lib/usdMaya/translatorXformable.h index e61c5abc43..882d8bb26c 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorXformable.h +++ b/plugin/pxr/maya/lib/usdMaya/translatorXformable.h @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYA_TRANSLATOR_XFORMABLE_H #define PXRUSDMAYA_TRANSLATOR_XFORMABLE_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorXformable_decompose.cpp b/plugin/pxr/maya/lib/usdMaya/translatorXformable_decompose.cpp similarity index 78% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorXformable_decompose.cpp rename to plugin/pxr/maya/lib/usdMaya/translatorXformable_decompose.cpp index d1e08cd80b..bf3162c3d3 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorXformable_decompose.cpp +++ b/plugin/pxr/maya/lib/usdMaya/translatorXformable_decompose.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxr/pxr.h" #include "usdMaya/translatorXformable.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/undoHelperCommand.cpp b/plugin/pxr/maya/lib/usdMaya/undoHelperCommand.cpp similarity index 67% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/undoHelperCommand.cpp rename to plugin/pxr/maya/lib/usdMaya/undoHelperCommand.cpp index f335382489..332a72e8c9 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/undoHelperCommand.cpp +++ b/plugin/pxr/maya/lib/usdMaya/undoHelperCommand.cpp @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/undoHelperCommand.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/undoHelperCommand.h b/plugin/pxr/maya/lib/usdMaya/undoHelperCommand.h similarity index 72% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/undoHelperCommand.h rename to plugin/pxr/maya/lib/usdMaya/undoHelperCommand.h index ba913d3604..cd407cadc7 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/undoHelperCommand.h +++ b/plugin/pxr/maya/lib/usdMaya/undoHelperCommand.h @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYA_UNDO_HELPER_CMD_H #define PXRUSDMAYA_UNDO_HELPER_CMD_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/usdMaya.mel b/plugin/pxr/maya/lib/usdMaya/usdMaya.mel similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/usdMaya.mel rename to plugin/pxr/maya/lib/usdMaya/usdMaya.mel diff --git a/plugin/pxr/maya/lib/usdMaya/usdPrimProvider.cpp b/plugin/pxr/maya/lib/usdMaya/usdPrimProvider.cpp new file mode 100644 index 0000000000..1ec79b3a36 --- /dev/null +++ b/plugin/pxr/maya/lib/usdMaya/usdPrimProvider.cpp @@ -0,0 +1,27 @@ +// +// Copyright 2016 Pixar +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +#include "pxr/pxr.h" +#include "usdMaya/usdPrimProvider.h" + +PXR_NAMESPACE_OPEN_SCOPE + + +UsdMayaUsdPrimProvider::~UsdMayaUsdPrimProvider() +{ +} + +PXR_NAMESPACE_CLOSE_SCOPE + diff --git a/plugin/pxr/maya/lib/usdMaya/usdPrimProvider.h b/plugin/pxr/maya/lib/usdMaya/usdPrimProvider.h new file mode 100644 index 0000000000..f8efe46386 --- /dev/null +++ b/plugin/pxr/maya/lib/usdMaya/usdPrimProvider.h @@ -0,0 +1,40 @@ +// +// Copyright 2016 Pixar +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +#ifndef PXRUSDMAYA_USD_PRIM_PROVIDER_H +#define PXRUSDMAYA_USD_PRIM_PROVIDER_H + +#include "pxr/pxr.h" +#include "usdMaya/api.h" +#include "pxr/usd/usd/prim.h" + +PXR_NAMESPACE_OPEN_SCOPE + + +// interface class +class UsdMayaUsdPrimProvider +{ +public: + // returns the prim that this node is holding + virtual UsdPrim usdPrim() const = 0; + + PXRUSDMAYA_API + virtual ~UsdMayaUsdPrimProvider(); +}; + + +PXR_NAMESPACE_CLOSE_SCOPE + +#endif diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/usdTranslatorExport.mel b/plugin/pxr/maya/lib/usdMaya/usdTranslatorExport.mel similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/usdTranslatorExport.mel rename to plugin/pxr/maya/lib/usdMaya/usdTranslatorExport.mel diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/usdTranslatorImport.mel b/plugin/pxr/maya/lib/usdMaya/usdTranslatorImport.mel similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/usdTranslatorImport.mel rename to plugin/pxr/maya/lib/usdMaya/usdTranslatorImport.mel diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/userExportedAttributesUI.py b/plugin/pxr/maya/lib/usdMaya/userExportedAttributesUI.py similarity index 97% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/userExportedAttributesUI.py rename to plugin/pxr/maya/lib/usdMaya/userExportedAttributesUI.py index ffcffe287d..207fbaae58 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/userExportedAttributesUI.py +++ b/plugin/pxr/maya/lib/usdMaya/userExportedAttributesUI.py @@ -1,25 +1,17 @@ # # Copyright 2016 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # import json diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/userTaggedAttribute.cpp b/plugin/pxr/maya/lib/usdMaya/userTaggedAttribute.cpp similarity index 89% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/userTaggedAttribute.cpp rename to plugin/pxr/maya/lib/usdMaya/userTaggedAttribute.cpp index 38417945a1..72013e5330 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/userTaggedAttribute.cpp +++ b/plugin/pxr/maya/lib/usdMaya/userTaggedAttribute.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxr/pxr.h" #include "usdMaya/userTaggedAttribute.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/userTaggedAttribute.h b/plugin/pxr/maya/lib/usdMaya/userTaggedAttribute.h similarity index 80% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/userTaggedAttribute.h rename to plugin/pxr/maya/lib/usdMaya/userTaggedAttribute.h index f64f9074ed..be0d925ea9 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/userTaggedAttribute.h +++ b/plugin/pxr/maya/lib/usdMaya/userTaggedAttribute.h @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // /// \file usdMaya/userTaggedAttribute.h diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/util.cpp b/plugin/pxr/maya/lib/usdMaya/util.cpp similarity index 98% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/util.cpp rename to plugin/pxr/maya/lib/usdMaya/util.cpp index 93723c8b78..825eb539e4 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/util.cpp +++ b/plugin/pxr/maya/lib/usdMaya/util.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxr/pxr.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/util.h b/plugin/pxr/maya/lib/usdMaya/util.h similarity index 95% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/util.h rename to plugin/pxr/maya/lib/usdMaya/util.h index 5667b2402e..d7561aea94 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/util.h +++ b/plugin/pxr/maya/lib/usdMaya/util.h @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYA_UTIL_H #define PXRUSDMAYA_UTIL_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/wrapAdaptor.cpp b/plugin/pxr/maya/lib/usdMaya/wrapAdaptor.cpp similarity index 90% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/wrapAdaptor.cpp rename to plugin/pxr/maya/lib/usdMaya/wrapAdaptor.cpp index 658fcc289d..35de1a1157 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/wrapAdaptor.cpp +++ b/plugin/pxr/maya/lib/usdMaya/wrapAdaptor.cpp @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxr/pxr.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/wrapAssembly.cpp b/plugin/pxr/maya/lib/usdMaya/wrapAssembly.cpp similarity index 59% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/wrapAssembly.cpp rename to plugin/pxr/maya/lib/usdMaya/wrapAssembly.cpp index 662f08798d..040af63096 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/wrapAssembly.cpp +++ b/plugin/pxr/maya/lib/usdMaya/wrapAssembly.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxr/pxr.h" #include "usdMaya/referenceAssembly.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/wrapBlockSceneModificationContext.cpp b/plugin/pxr/maya/lib/usdMaya/wrapBlockSceneModificationContext.cpp similarity index 57% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/wrapBlockSceneModificationContext.cpp rename to plugin/pxr/maya/lib/usdMaya/wrapBlockSceneModificationContext.cpp index 3fc5836aee..2fb0bb6e1d 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/wrapBlockSceneModificationContext.cpp +++ b/plugin/pxr/maya/lib/usdMaya/wrapBlockSceneModificationContext.cpp @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxr/pxr.h" #include "usdMaya/blockSceneModificationContext.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/wrapColorSpace.cpp b/plugin/pxr/maya/lib/usdMaya/wrapColorSpace.cpp similarity index 57% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/wrapColorSpace.cpp rename to plugin/pxr/maya/lib/usdMaya/wrapColorSpace.cpp index 5a85ae14a8..39effabfed 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/wrapColorSpace.cpp +++ b/plugin/pxr/maya/lib/usdMaya/wrapColorSpace.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxr/pxr.h" #include "usdMaya/colorSpace.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/wrapDiagnosticDelegate.cpp b/plugin/pxr/maya/lib/usdMaya/wrapDiagnosticDelegate.cpp similarity index 58% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/wrapDiagnosticDelegate.cpp rename to plugin/pxr/maya/lib/usdMaya/wrapDiagnosticDelegate.cpp index 93c4dd4c2a..15ef1837e1 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/wrapDiagnosticDelegate.cpp +++ b/plugin/pxr/maya/lib/usdMaya/wrapDiagnosticDelegate.cpp @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxr/pxr.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/wrapEditUtil.cpp b/plugin/pxr/maya/lib/usdMaya/wrapEditUtil.cpp similarity index 89% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/wrapEditUtil.cpp rename to plugin/pxr/maya/lib/usdMaya/wrapEditUtil.cpp index 28cb8e8df0..5854fd32c1 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/wrapEditUtil.cpp +++ b/plugin/pxr/maya/lib/usdMaya/wrapEditUtil.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxr/pxr.h" #include "usdMaya/editUtil.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/wrapMeshUtil.cpp b/plugin/pxr/maya/lib/usdMaya/wrapMeshUtil.cpp similarity index 65% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/wrapMeshUtil.cpp rename to plugin/pxr/maya/lib/usdMaya/wrapMeshUtil.cpp index fc750da8fe..ac7ec795eb 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/wrapMeshUtil.cpp +++ b/plugin/pxr/maya/lib/usdMaya/wrapMeshUtil.cpp @@ -1,25 +1,17 @@ // // Copyright 2017 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxr/pxr.h" diff --git a/plugin/pxr/maya/lib/usdMaya/wrapQuery.cpp b/plugin/pxr/maya/lib/usdMaya/wrapQuery.cpp new file mode 100644 index 0000000000..9d861752e4 --- /dev/null +++ b/plugin/pxr/maya/lib/usdMaya/wrapQuery.cpp @@ -0,0 +1,34 @@ +// +// Copyright 2016 Pixar +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +#include "pxr/pxr.h" +#include "usdMaya/query.h" + +#include +#include + +#include "pxr/base/tf/pyResultConversions.h" + +using namespace std; +using namespace boost::python; +using namespace boost; + +PXR_NAMESPACE_USING_DIRECTIVE + +void wrapQuery() +{ + def("GetPrim", UsdMayaQuery::GetPrim); + def("ReloadStage", UsdMayaQuery::ReloadStage); +} diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/wrapReadUtil.cpp b/plugin/pxr/maya/lib/usdMaya/wrapReadUtil.cpp similarity index 73% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/wrapReadUtil.cpp rename to plugin/pxr/maya/lib/usdMaya/wrapReadUtil.cpp index 13b333c28c..b7442faf41 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/wrapReadUtil.cpp +++ b/plugin/pxr/maya/lib/usdMaya/wrapReadUtil.cpp @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxr/pxr.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/wrapRoundTripUtil.cpp b/plugin/pxr/maya/lib/usdMaya/wrapRoundTripUtil.cpp similarity index 56% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/wrapRoundTripUtil.cpp rename to plugin/pxr/maya/lib/usdMaya/wrapRoundTripUtil.cpp index 1a0266e7d9..76b5a681c2 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/wrapRoundTripUtil.cpp +++ b/plugin/pxr/maya/lib/usdMaya/wrapRoundTripUtil.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxr/pxr.h" diff --git a/plugin/pxr/maya/lib/usdMaya/wrapStageCache.cpp b/plugin/pxr/maya/lib/usdMaya/wrapStageCache.cpp new file mode 100644 index 0000000000..3198977432 --- /dev/null +++ b/plugin/pxr/maya/lib/usdMaya/wrapStageCache.cpp @@ -0,0 +1,42 @@ +// +// Copyright 2016 Pixar +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +#include "pxr/pxr.h" +#include "usdMaya/stageCache.h" + +#include +#include +#include + +#include "pxr/base/tf/pyResultConversions.h" + +using namespace std; +using namespace boost::python; +using namespace boost; + +PXR_NAMESPACE_USING_DIRECTIVE + +void wrapStageCache() +{ + class_("StageCache") + + .def("Get", &UsdMayaStageCache::Get, + (args("forcePopulate") = true), + return_value_policy()) + .staticmethod("Get") + .def("Clear", &UsdMayaStageCache::Clear) + .staticmethod("Clear") + ; +} diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/wrapUserTaggedAttribute.cpp b/plugin/pxr/maya/lib/usdMaya/wrapUserTaggedAttribute.cpp similarity index 73% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/wrapUserTaggedAttribute.cpp rename to plugin/pxr/maya/lib/usdMaya/wrapUserTaggedAttribute.cpp index eb8aba7f21..7e8fd95708 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/wrapUserTaggedAttribute.cpp +++ b/plugin/pxr/maya/lib/usdMaya/wrapUserTaggedAttribute.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxr/pxr.h" #include "usdMaya/userTaggedAttribute.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/wrapWriteUtil.cpp b/plugin/pxr/maya/lib/usdMaya/wrapWriteUtil.cpp similarity index 53% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/wrapWriteUtil.cpp rename to plugin/pxr/maya/lib/usdMaya/wrapWriteUtil.cpp index 3d06b35020..9d4afe3208 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/wrapWriteUtil.cpp +++ b/plugin/pxr/maya/lib/usdMaya/wrapWriteUtil.cpp @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxr/pxr.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/wrapXformStack.cpp b/plugin/pxr/maya/lib/usdMaya/wrapXformStack.cpp similarity index 90% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/wrapXformStack.cpp rename to plugin/pxr/maya/lib/usdMaya/wrapXformStack.cpp index 3d40220b1d..b7e4ac62b2 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/wrapXformStack.cpp +++ b/plugin/pxr/maya/lib/usdMaya/wrapXformStack.cpp @@ -1,25 +1,17 @@ // // Copyright 2017 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxr/pxr.h" #include "usdMaya/xformStack.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/writeJob.cpp b/plugin/pxr/maya/lib/usdMaya/writeJob.cpp similarity index 97% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/writeJob.cpp rename to plugin/pxr/maya/lib/usdMaya/writeJob.cpp index d4b71b7d46..96c07fb310 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/writeJob.cpp +++ b/plugin/pxr/maya/lib/usdMaya/writeJob.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxr/pxr.h" #include "usdMaya/writeJob.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/writeJob.h b/plugin/pxr/maya/lib/usdMaya/writeJob.h similarity index 75% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/writeJob.h rename to plugin/pxr/maya/lib/usdMaya/writeJob.h index 7ce7dab369..70bf92bbda 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/writeJob.h +++ b/plugin/pxr/maya/lib/usdMaya/writeJob.h @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYA_WRITE_JOB_H #define PXRUSDMAYA_WRITE_JOB_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/writeJobContext.cpp b/plugin/pxr/maya/lib/usdMaya/writeJobContext.cpp similarity index 95% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/writeJobContext.cpp rename to plugin/pxr/maya/lib/usdMaya/writeJobContext.cpp index 21a20742c9..91fb3d8de6 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/writeJobContext.cpp +++ b/plugin/pxr/maya/lib/usdMaya/writeJobContext.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxr/pxr.h" #include "usdMaya/writeJobContext.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/writeJobContext.h b/plugin/pxr/maya/lib/usdMaya/writeJobContext.h similarity index 90% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/writeJobContext.h rename to plugin/pxr/maya/lib/usdMaya/writeJobContext.h index 18dba96186..c0f473fbb7 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/writeJobContext.h +++ b/plugin/pxr/maya/lib/usdMaya/writeJobContext.h @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYA_WRITE_JOB_CONTEXT_H #define PXRUSDMAYA_WRITE_JOB_CONTEXT_H diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/writeUtil.cpp b/plugin/pxr/maya/lib/usdMaya/writeUtil.cpp similarity index 98% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/writeUtil.cpp rename to plugin/pxr/maya/lib/usdMaya/writeUtil.cpp index 614b7e21a0..586918ae98 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/writeUtil.cpp +++ b/plugin/pxr/maya/lib/usdMaya/writeUtil.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxr/pxr.h" #include "usdMaya/writeUtil.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/writeUtil.h b/plugin/pxr/maya/lib/usdMaya/writeUtil.h similarity index 92% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/writeUtil.h rename to plugin/pxr/maya/lib/usdMaya/writeUtil.h index e0c6cc5c0d..b522b039ea 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/writeUtil.h +++ b/plugin/pxr/maya/lib/usdMaya/writeUtil.h @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // /// \file usdMaya/writeUtil.h diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/xformStack.cpp b/plugin/pxr/maya/lib/usdMaya/xformStack.cpp similarity index 96% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/xformStack.cpp rename to plugin/pxr/maya/lib/usdMaya/xformStack.cpp index 4ec61e0a27..73683b7dd0 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/xformStack.cpp +++ b/plugin/pxr/maya/lib/usdMaya/xformStack.cpp @@ -1,24 +1,16 @@ // Copyright 2017 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/xformStack.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/xformStack.h b/plugin/pxr/maya/lib/usdMaya/xformStack.h similarity index 92% rename from plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/xformStack.h rename to plugin/pxr/maya/lib/usdMaya/xformStack.h index aa05e6b192..2a1492dae1 100644 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/xformStack.h +++ b/plugin/pxr/maya/lib/usdMaya/xformStack.h @@ -1,24 +1,16 @@ // Copyright 2017 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDMAYA_XFORM_STACK_H diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/CMakeLists.txt b/plugin/pxr/maya/plugin/CMakeLists.txt similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/plugin/CMakeLists.txt rename to plugin/pxr/maya/plugin/CMakeLists.txt diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsd/CMakeLists.txt b/plugin/pxr/maya/plugin/pxrUsd/CMakeLists.txt similarity index 83% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsd/CMakeLists.txt rename to plugin/pxr/maya/plugin/pxrUsd/CMakeLists.txt index 471056edcf..4a5c1fcac9 100644 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsd/CMakeLists.txt +++ b/plugin/pxr/maya/plugin/pxrUsd/CMakeLists.txt @@ -42,8 +42,8 @@ pxr_register_test(testPxrUsdAlembicChaser COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testPxrUsdAlembicChaser" TESTENV testPxrUsdAlembicChaser ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsd/alembicChaser.cpp b/plugin/pxr/maya/plugin/pxrUsd/alembicChaser.cpp similarity index 93% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsd/alembicChaser.cpp rename to plugin/pxr/maya/plugin/pxrUsd/alembicChaser.cpp index bf7d1bed30..4aca2278bc 100644 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsd/alembicChaser.cpp +++ b/plugin/pxr/maya/plugin/pxrUsd/alembicChaser.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/chaserRegistry.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsd/api.h b/plugin/pxr/maya/plugin/pxrUsd/api.h similarity index 50% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsd/api.h rename to plugin/pxr/maya/plugin/pxrUsd/api.h index 65effd2ef0..eb0c65b17d 100644 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsd/api.h +++ b/plugin/pxr/maya/plugin/pxrUsd/api.h @@ -1,25 +1,17 @@ // // Copyright 2017 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSD_API_H #define PXRUSD_API_H diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsd/overview.dox b/plugin/pxr/maya/plugin/pxrUsd/overview.dox similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsd/overview.dox rename to plugin/pxr/maya/plugin/pxrUsd/overview.dox diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsd/plugInfo.json b/plugin/pxr/maya/plugin/pxrUsd/plugInfo.json similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsd/plugInfo.json rename to plugin/pxr/maya/plugin/pxrUsd/plugInfo.json diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsd/plugin.cpp b/plugin/pxr/maya/plugin/pxrUsd/plugin.cpp similarity index 90% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsd/plugin.cpp rename to plugin/pxr/maya/plugin/pxrUsd/plugin.cpp index 9aa9ecd0d2..03b388fa0f 100644 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsd/plugin.cpp +++ b/plugin/pxr/maya/plugin/pxrUsd/plugin.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxr/pxr.h" #include "pxrUsd/api.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsd/testenv/AlembicChaser/AlembicChaser.ma b/plugin/pxr/maya/plugin/pxrUsd/testenv/AlembicChaser/AlembicChaser.ma similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsd/testenv/AlembicChaser/AlembicChaser.ma rename to plugin/pxr/maya/plugin/pxrUsd/testenv/AlembicChaser/AlembicChaser.ma diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsd/testenv/AlembicChaser/AlembicChaserPrimvars.ma b/plugin/pxr/maya/plugin/pxrUsd/testenv/AlembicChaser/AlembicChaserPrimvars.ma similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsd/testenv/AlembicChaser/AlembicChaserPrimvars.ma rename to plugin/pxr/maya/plugin/pxrUsd/testenv/AlembicChaser/AlembicChaserPrimvars.ma diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsd/testenv/testPxrUsdAlembicChaser.py b/plugin/pxr/maya/plugin/pxrUsd/testenv/testPxrUsdAlembicChaser.py similarity index 84% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsd/testenv/testPxrUsdAlembicChaser.py rename to plugin/pxr/maya/plugin/pxrUsd/testenv/testPxrUsdAlembicChaser.py index 03004c58be..a8f91fe734 100644 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsd/testenv/testPxrUsdAlembicChaser.py +++ b/plugin/pxr/maya/plugin/pxrUsd/testenv/testPxrUsdAlembicChaser.py @@ -2,25 +2,17 @@ # # Copyright 2016 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # diff --git a/plugin/pxr/maya/plugin/pxrUsd/usdTranslator.cpp b/plugin/pxr/maya/plugin/pxrUsd/usdTranslator.cpp new file mode 100644 index 0000000000..b31d31ee89 --- /dev/null +++ b/plugin/pxr/maya/plugin/pxrUsd/usdTranslator.cpp @@ -0,0 +1,34 @@ +// +// Copyright 2016 Pixar +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +#include "usdMaya/translatorModelAssembly.h" +#include "usdMaya/primWriterRegistry.h" + +#include "pxr/pxr.h" + +PXR_NAMESPACE_OPEN_SCOPE + +PXRUSDMAYA_DEFINE_WRITER(pxrUsdReferenceAssembly, args, context) +{ + return UsdMayaTranslatorModelAssembly::Create(args, context); +} + + +PXRUSDMAYA_DEFINE_WRITER(pxrUsdProxyShape, args, context) +{ + return UsdMayaTranslatorModelAssembly::Create(args, context); +} + +PXR_NAMESPACE_CLOSE_SCOPE diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/AEpxrUsdPreviewSurfaceTemplate.mel b/plugin/pxr/maya/plugin/pxrUsdPreviewSurface/AEpxrUsdPreviewSurfaceTemplate.mel similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/AEpxrUsdPreviewSurfaceTemplate.mel rename to plugin/pxr/maya/plugin/pxrUsdPreviewSurface/AEpxrUsdPreviewSurfaceTemplate.mel diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/CMakeLists.txt b/plugin/pxr/maya/plugin/pxrUsdPreviewSurface/CMakeLists.txt similarity index 93% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/CMakeLists.txt rename to plugin/pxr/maya/plugin/pxrUsdPreviewSurface/CMakeLists.txt index abdf95a7fe..f72f534498 100644 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/CMakeLists.txt +++ b/plugin/pxr/maya/plugin/pxrUsdPreviewSurface/CMakeLists.txt @@ -79,8 +79,8 @@ pxr_register_test(testPxrUsdPreviewSurfaceExport COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testPxrUsdPreviewSurfaceExport" TESTENV testPxrUsdPreviewSurfaceExport ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugins/pxrUsdPreviewSurface/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugins/pxrUsdPreviewSurface/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/api.h b/plugin/pxr/maya/plugin/pxrUsdPreviewSurface/api.h similarity index 54% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/api.h rename to plugin/pxr/maya/plugin/pxrUsdPreviewSurface/api.h index f56ee5ca1f..14023c32c0 100644 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/api.h +++ b/plugin/pxr/maya/plugin/pxrUsdPreviewSurface/api.h @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDPREVIEWSURFACE_API_H #define PXRUSDPREVIEWSURFACE_API_H diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/float4ToFloatW.jinja2.xml b/plugin/pxr/maya/plugin/pxrUsdPreviewSurface/float4ToFloatW.jinja2.xml similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/float4ToFloatW.jinja2.xml rename to plugin/pxr/maya/plugin/pxrUsdPreviewSurface/float4ToFloatW.jinja2.xml diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/float4ToFloatW.xml b/plugin/pxr/maya/plugin/pxrUsdPreviewSurface/float4ToFloatW.xml similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/float4ToFloatW.xml rename to plugin/pxr/maya/plugin/pxrUsdPreviewSurface/float4ToFloatW.xml diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/float4ToFloatW_shaderCode.glsl b/plugin/pxr/maya/plugin/pxrUsdPreviewSurface/float4ToFloatW_shaderCode.glsl similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/float4ToFloatW_shaderCode.glsl rename to plugin/pxr/maya/plugin/pxrUsdPreviewSurface/float4ToFloatW_shaderCode.glsl diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/float4ToFloatX.jinja2.xml b/plugin/pxr/maya/plugin/pxrUsdPreviewSurface/float4ToFloatX.jinja2.xml similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/float4ToFloatX.jinja2.xml rename to plugin/pxr/maya/plugin/pxrUsdPreviewSurface/float4ToFloatX.jinja2.xml diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/float4ToFloatX.xml b/plugin/pxr/maya/plugin/pxrUsdPreviewSurface/float4ToFloatX.xml similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/float4ToFloatX.xml rename to plugin/pxr/maya/plugin/pxrUsdPreviewSurface/float4ToFloatX.xml diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/float4ToFloatX_shaderCode.glsl b/plugin/pxr/maya/plugin/pxrUsdPreviewSurface/float4ToFloatX_shaderCode.glsl similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/float4ToFloatX_shaderCode.glsl rename to plugin/pxr/maya/plugin/pxrUsdPreviewSurface/float4ToFloatX_shaderCode.glsl diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/float4ToFloatY.jinja2.xml b/plugin/pxr/maya/plugin/pxrUsdPreviewSurface/float4ToFloatY.jinja2.xml similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/float4ToFloatY.jinja2.xml rename to plugin/pxr/maya/plugin/pxrUsdPreviewSurface/float4ToFloatY.jinja2.xml diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/float4ToFloatY.xml b/plugin/pxr/maya/plugin/pxrUsdPreviewSurface/float4ToFloatY.xml similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/float4ToFloatY.xml rename to plugin/pxr/maya/plugin/pxrUsdPreviewSurface/float4ToFloatY.xml diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/float4ToFloatY_shaderCode.glsl b/plugin/pxr/maya/plugin/pxrUsdPreviewSurface/float4ToFloatY_shaderCode.glsl similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/float4ToFloatY_shaderCode.glsl rename to plugin/pxr/maya/plugin/pxrUsdPreviewSurface/float4ToFloatY_shaderCode.glsl diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/float4ToFloatZ.jinja2.xml b/plugin/pxr/maya/plugin/pxrUsdPreviewSurface/float4ToFloatZ.jinja2.xml similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/float4ToFloatZ.jinja2.xml rename to plugin/pxr/maya/plugin/pxrUsdPreviewSurface/float4ToFloatZ.jinja2.xml diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/float4ToFloatZ.xml b/plugin/pxr/maya/plugin/pxrUsdPreviewSurface/float4ToFloatZ.xml similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/float4ToFloatZ.xml rename to plugin/pxr/maya/plugin/pxrUsdPreviewSurface/float4ToFloatZ.xml diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/float4ToFloatZ_shaderCode.glsl b/plugin/pxr/maya/plugin/pxrUsdPreviewSurface/float4ToFloatZ_shaderCode.glsl similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/float4ToFloatZ_shaderCode.glsl rename to plugin/pxr/maya/plugin/pxrUsdPreviewSurface/float4ToFloatZ_shaderCode.glsl diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/lightingContributions.jinja2.xml b/plugin/pxr/maya/plugin/pxrUsdPreviewSurface/lightingContributions.jinja2.xml similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/lightingContributions.jinja2.xml rename to plugin/pxr/maya/plugin/pxrUsdPreviewSurface/lightingContributions.jinja2.xml diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/lightingContributions.xml b/plugin/pxr/maya/plugin/pxrUsdPreviewSurface/lightingContributions.xml similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/lightingContributions.xml rename to plugin/pxr/maya/plugin/pxrUsdPreviewSurface/lightingContributions.xml diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/overview.dox b/plugin/pxr/maya/plugin/pxrUsdPreviewSurface/overview.dox similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/overview.dox rename to plugin/pxr/maya/plugin/pxrUsdPreviewSurface/overview.dox diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/plugInfo.json b/plugin/pxr/maya/plugin/pxrUsdPreviewSurface/plugInfo.json similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/plugInfo.json rename to plugin/pxr/maya/plugin/pxrUsdPreviewSurface/plugInfo.json diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/plugin.cpp b/plugin/pxr/maya/plugin/pxrUsdPreviewSurface/plugin.cpp similarity index 88% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/plugin.cpp rename to plugin/pxr/maya/plugin/pxrUsdPreviewSurface/plugin.cpp index 58f606db8e..a3504f2704 100644 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/plugin.cpp +++ b/plugin/pxr/maya/plugin/pxrUsdPreviewSurface/plugin.cpp @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxr/pxr.h" #include "pxrUsdPreviewSurface/api.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/pxrUsdPreviewSurfaceGenFragments.py b/plugin/pxr/maya/plugin/pxrUsdPreviewSurface/pxrUsdPreviewSurfaceGenFragments.py similarity index 92% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/pxrUsdPreviewSurfaceGenFragments.py rename to plugin/pxr/maya/plugin/pxrUsdPreviewSurface/pxrUsdPreviewSurfaceGenFragments.py index f6c56d929a..818f2f2ee9 100644 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/pxrUsdPreviewSurfaceGenFragments.py +++ b/plugin/pxr/maya/plugin/pxrUsdPreviewSurface/pxrUsdPreviewSurfaceGenFragments.py @@ -2,25 +2,17 @@ # # Copyright 2018 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # """ This script generates Maya fragment XML files by extracting sections of the diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/testenv/PxrUsdPreviewSurfaceDrawTest/PxrUsdPreviewSurfaceDrawTest.ma b/plugin/pxr/maya/plugin/pxrUsdPreviewSurface/testenv/PxrUsdPreviewSurfaceDrawTest/PxrUsdPreviewSurfaceDrawTest.ma similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/testenv/PxrUsdPreviewSurfaceDrawTest/PxrUsdPreviewSurfaceDrawTest.ma rename to plugin/pxr/maya/plugin/pxrUsdPreviewSurface/testenv/PxrUsdPreviewSurfaceDrawTest/PxrUsdPreviewSurfaceDrawTest.ma diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/testenv/PxrUsdPreviewSurfaceDrawTest/baseline/PxrUsdPreviewSurfaceDrawTest_value_ramps.png b/plugin/pxr/maya/plugin/pxrUsdPreviewSurface/testenv/PxrUsdPreviewSurfaceDrawTest/baseline/PxrUsdPreviewSurfaceDrawTest_value_ramps.png similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/testenv/PxrUsdPreviewSurfaceDrawTest/baseline/PxrUsdPreviewSurfaceDrawTest_value_ramps.png rename to plugin/pxr/maya/plugin/pxrUsdPreviewSurface/testenv/PxrUsdPreviewSurfaceDrawTest/baseline/PxrUsdPreviewSurfaceDrawTest_value_ramps.png diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/testenv/PxrUsdPreviewSurfaceExportTest/Brazilian_rosewood_pxr128.png b/plugin/pxr/maya/plugin/pxrUsdPreviewSurface/testenv/PxrUsdPreviewSurfaceExportTest/Brazilian_rosewood_pxr128.png similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/testenv/PxrUsdPreviewSurfaceExportTest/Brazilian_rosewood_pxr128.png rename to plugin/pxr/maya/plugin/pxrUsdPreviewSurface/testenv/PxrUsdPreviewSurfaceExportTest/Brazilian_rosewood_pxr128.png diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/testenv/PxrUsdPreviewSurfaceExportTest/Brazilian_rosewood_pxr128_bmp.png b/plugin/pxr/maya/plugin/pxrUsdPreviewSurface/testenv/PxrUsdPreviewSurfaceExportTest/Brazilian_rosewood_pxr128_bmp.png similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/testenv/PxrUsdPreviewSurfaceExportTest/Brazilian_rosewood_pxr128_bmp.png rename to plugin/pxr/maya/plugin/pxrUsdPreviewSurface/testenv/PxrUsdPreviewSurfaceExportTest/Brazilian_rosewood_pxr128_bmp.png diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/testenv/PxrUsdPreviewSurfaceExportTest/PxrUsdPreviewSurfaceExportTest.ma b/plugin/pxr/maya/plugin/pxrUsdPreviewSurface/testenv/PxrUsdPreviewSurfaceExportTest/PxrUsdPreviewSurfaceExportTest.ma similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/testenv/PxrUsdPreviewSurfaceExportTest/PxrUsdPreviewSurfaceExportTest.ma rename to plugin/pxr/maya/plugin/pxrUsdPreviewSurface/testenv/PxrUsdPreviewSurfaceExportTest/PxrUsdPreviewSurfaceExportTest.ma diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/testenv/testPxrUsdPreviewSurfaceDraw.py b/plugin/pxr/maya/plugin/pxrUsdPreviewSurface/testenv/testPxrUsdPreviewSurfaceDraw.py similarity index 77% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/testenv/testPxrUsdPreviewSurfaceDraw.py rename to plugin/pxr/maya/plugin/pxrUsdPreviewSurface/testenv/testPxrUsdPreviewSurfaceDraw.py index abfcfe2422..6817a25ea9 100644 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/testenv/testPxrUsdPreviewSurfaceDraw.py +++ b/plugin/pxr/maya/plugin/pxrUsdPreviewSurface/testenv/testPxrUsdPreviewSurfaceDraw.py @@ -2,25 +2,17 @@ # # Copyright 2018 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # from maya import cmds diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/testenv/testPxrUsdPreviewSurfaceExport.py b/plugin/pxr/maya/plugin/pxrUsdPreviewSurface/testenv/testPxrUsdPreviewSurfaceExport.py similarity index 89% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/testenv/testPxrUsdPreviewSurfaceExport.py rename to plugin/pxr/maya/plugin/pxrUsdPreviewSurface/testenv/testPxrUsdPreviewSurfaceExport.py index e2e770a137..a145226e6a 100644 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/testenv/testPxrUsdPreviewSurfaceExport.py +++ b/plugin/pxr/maya/plugin/pxrUsdPreviewSurface/testenv/testPxrUsdPreviewSurfaceExport.py @@ -2,25 +2,17 @@ # # Copyright 2018 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # from pxr import Gf diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurface.cpp b/plugin/pxr/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurface.cpp similarity index 94% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurface.cpp rename to plugin/pxr/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurface.cpp index 4353c2701b..fd4c34cf6c 100644 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurface.cpp +++ b/plugin/pxr/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurface.cpp @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxrUsdPreviewSurface/usdPreviewSurface.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurface.h b/plugin/pxr/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurface.h similarity index 80% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurface.h rename to plugin/pxr/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurface.h index d1c92b5466..f83be8f82f 100644 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurface.h +++ b/plugin/pxr/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurface.h @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDPREVIEWSURFACE_USD_PREVIEW_SURFACE_H #define PXRUSDPREVIEWSURFACE_USD_PREVIEW_SURFACE_H diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurface.xml b/plugin/pxr/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurface.xml similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurface.xml rename to plugin/pxr/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurface.xml diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceCombiner.jinja2.xml b/plugin/pxr/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceCombiner.jinja2.xml similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceCombiner.jinja2.xml rename to plugin/pxr/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceCombiner.jinja2.xml diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceCombiner.xml b/plugin/pxr/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceCombiner.xml similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceCombiner.xml rename to plugin/pxr/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceCombiner.xml diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceCombiner_shaderCode.glsl b/plugin/pxr/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceCombiner_shaderCode.glsl similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceCombiner_shaderCode.glsl rename to plugin/pxr/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceCombiner_shaderCode.glsl diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceLighting.jinja2.xml b/plugin/pxr/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceLighting.jinja2.xml similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceLighting.jinja2.xml rename to plugin/pxr/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceLighting.jinja2.xml diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceLighting.xml b/plugin/pxr/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceLighting.xml similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceLighting.xml rename to plugin/pxr/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceLighting.xml diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceShadingNodeOverride.cpp b/plugin/pxr/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceShadingNodeOverride.cpp similarity index 74% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceShadingNodeOverride.cpp rename to plugin/pxr/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceShadingNodeOverride.cpp index fb91522db2..38636ccc29 100644 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceShadingNodeOverride.cpp +++ b/plugin/pxr/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceShadingNodeOverride.cpp @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxrUsdPreviewSurface/usdPreviewSurfaceShadingNodeOverride.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceShadingNodeOverride.h b/plugin/pxr/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceShadingNodeOverride.h similarity index 73% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceShadingNodeOverride.h rename to plugin/pxr/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceShadingNodeOverride.h index 6044ca341e..65c0a2a87d 100644 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceShadingNodeOverride.h +++ b/plugin/pxr/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceShadingNodeOverride.h @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDPREVIEWSURFACE_USD_PREVIEW_SURFACE_SHADING_NODE_OVERRIDE_H #define PXRUSDPREVIEWSURFACE_USD_PREVIEW_SURFACE_SHADING_NODE_OVERRIDE_H diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceWriter.cpp b/plugin/pxr/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceWriter.cpp similarity index 92% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceWriter.cpp rename to plugin/pxr/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceWriter.cpp index 3c641574e7..19d45d713e 100644 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceWriter.cpp +++ b/plugin/pxr/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceWriter.cpp @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxr/pxr.h" #include "pxrUsdPreviewSurface/usdPreviewSurfaceWriter.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceWriter.h b/plugin/pxr/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceWriter.h similarity index 53% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceWriter.h rename to plugin/pxr/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceWriter.h index c831a27ef2..733887318c 100644 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceWriter.h +++ b/plugin/pxr/maya/plugin/pxrUsdPreviewSurface/usdPreviewSurfaceWriter.h @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDPREVIEWSURFACE_USD_PREVIEW_SURFACE_WRITER_H #define PXRUSDPREVIEWSURFACE_USD_PREVIEW_SURFACE_WRITER_H diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/CMakeLists.txt b/plugin/pxr/maya/plugin/pxrUsdTranslators/CMakeLists.txt similarity index 83% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/CMakeLists.txt rename to plugin/pxr/maya/plugin/pxrUsdTranslators/CMakeLists.txt index aeaa97fc95..484ffe4377 100644 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/CMakeLists.txt +++ b/plugin/pxr/maya/plugin/pxrUsdTranslators/CMakeLists.txt @@ -69,8 +69,8 @@ pxr_register_test(testPxrUsdTranslators CUSTOM_PYTHON ${MAYA_PY_EXECUTABLE} COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testPxrUsdTranslators" ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) @@ -84,8 +84,8 @@ pxr_register_test(testPxrUsdTranslatorsScope COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testPxrUsdTranslatorsScope" TESTENV testPxrUsdTranslatorsScope ENV - MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/plugin - MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/third_party/maya/share/usd/plugins/usdMaya/resources + MAYA_PLUG_IN_PATH=${CMAKE_INSTALL_PREFIX}/maya/plugin + MAYA_SCRIPT_PATH=${CMAKE_INSTALL_PREFIX}/maya/share/usd/plugins/usdMaya/resources MAYA_DISABLE_CIP=1 MAYA_APP_DIR=/maya_profile ) diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/api.h b/plugin/pxr/maya/plugin/pxrUsdTranslators/api.h similarity index 53% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/api.h rename to plugin/pxr/maya/plugin/pxrUsdTranslators/api.h index 347994c467..c80abf78c9 100644 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/api.h +++ b/plugin/pxr/maya/plugin/pxrUsdTranslators/api.h @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDTRANSLATORS_API_H #define PXRUSDTRANSLATORS_API_H diff --git a/plugin/pxr/maya/plugin/pxrUsdTranslators/cameraReader.cpp b/plugin/pxr/maya/plugin/pxrUsdTranslators/cameraReader.cpp new file mode 100644 index 0000000000..39ab380866 --- /dev/null +++ b/plugin/pxr/maya/plugin/pxrUsdTranslators/cameraReader.cpp @@ -0,0 +1,41 @@ +// +// Copyright 2016 Pixar +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +#include "pxr/pxr.h" +#include "usdMaya/primReaderRegistry.h" +#include "usdMaya/translatorCamera.h" + +#include "pxr/usd/usd/prim.h" +#include "pxr/usd/usdGeom/camera.h" + +#include + +PXR_NAMESPACE_OPEN_SCOPE + + + +PXRUSDMAYA_DEFINE_READER(UsdGeomCamera, args, context) +{ + const UsdPrim& usdPrim = args.GetUsdPrim(); + MObject parentNode = context->GetMayaNode(usdPrim.GetPath().GetParentPath(), true); + return UsdMayaTranslatorCamera::Read( + UsdGeomCamera(usdPrim), + parentNode, + args, + context); +} + +PXR_NAMESPACE_CLOSE_SCOPE + diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/cameraWriter.cpp b/plugin/pxr/maya/plugin/pxrUsdTranslators/cameraWriter.cpp similarity index 86% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/cameraWriter.cpp rename to plugin/pxr/maya/plugin/pxrUsdTranslators/cameraWriter.cpp index d398740d20..c12f337f5f 100644 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/cameraWriter.cpp +++ b/plugin/pxr/maya/plugin/pxrUsdTranslators/cameraWriter.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxr/pxr.h" #include "pxrUsdTranslators/cameraWriter.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/cameraWriter.h b/plugin/pxr/maya/plugin/pxrUsdTranslators/cameraWriter.h similarity index 53% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/cameraWriter.h rename to plugin/pxr/maya/plugin/pxrUsdTranslators/cameraWriter.h index 5949d74014..57a11e6745 100644 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/cameraWriter.h +++ b/plugin/pxr/maya/plugin/pxrUsdTranslators/cameraWriter.h @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDTRANSLATORS_CAMERA_WRITER_H #define PXRUSDTRANSLATORS_CAMERA_WRITER_H diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/fileTextureWriter.cpp b/plugin/pxr/maya/plugin/pxrUsdTranslators/fileTextureWriter.cpp similarity index 93% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/fileTextureWriter.cpp rename to plugin/pxr/maya/plugin/pxrUsdTranslators/fileTextureWriter.cpp index dc599ff1c9..db3a125a2c 100644 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/fileTextureWriter.cpp +++ b/plugin/pxr/maya/plugin/pxrUsdTranslators/fileTextureWriter.cpp @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxr/pxr.h" #include "pxrUsdTranslators/fileTextureWriter.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/fileTextureWriter.h b/plugin/pxr/maya/plugin/pxrUsdTranslators/fileTextureWriter.h similarity index 54% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/fileTextureWriter.h rename to plugin/pxr/maya/plugin/pxrUsdTranslators/fileTextureWriter.h index ab860f509c..104f00139d 100644 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/fileTextureWriter.h +++ b/plugin/pxr/maya/plugin/pxrUsdTranslators/fileTextureWriter.h @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDTRANSLATORS_FILE_TEXTURE_WRITER_H #define PXRUSDTRANSLATORS_FILE_TEXTURE_WRITER_H diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/instancerWriter.cpp b/plugin/pxr/maya/plugin/pxrUsdTranslators/instancerWriter.cpp similarity index 94% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/instancerWriter.cpp rename to plugin/pxr/maya/plugin/pxrUsdTranslators/instancerWriter.cpp index 36e2d91954..44f1c78d80 100644 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/instancerWriter.cpp +++ b/plugin/pxr/maya/plugin/pxrUsdTranslators/instancerWriter.cpp @@ -1,25 +1,17 @@ // // Copyright 2017 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxrUsdTranslators/instancerWriter.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/instancerWriter.h b/plugin/pxr/maya/plugin/pxrUsdTranslators/instancerWriter.h similarity index 76% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/instancerWriter.h rename to plugin/pxr/maya/plugin/pxrUsdTranslators/instancerWriter.h index b086451a15..f0b1448482 100644 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/instancerWriter.h +++ b/plugin/pxr/maya/plugin/pxrUsdTranslators/instancerWriter.h @@ -1,25 +1,17 @@ // // Copyright 2017 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDTRANSLATORS_INSTANCER_WRITER_H #define PXRUSDTRANSLATORS_INSTANCER_WRITER_H diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/jointWriter.cpp b/plugin/pxr/maya/plugin/pxrUsdTranslators/jointWriter.cpp similarity index 96% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/jointWriter.cpp rename to plugin/pxr/maya/plugin/pxrUsdTranslators/jointWriter.cpp index c34cd12e3b..803c1b244c 100644 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/jointWriter.cpp +++ b/plugin/pxr/maya/plugin/pxrUsdTranslators/jointWriter.cpp @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxr/pxr.h" #include "pxrUsdTranslators/jointWriter.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/jointWriter.h b/plugin/pxr/maya/plugin/pxrUsdTranslators/jointWriter.h similarity index 76% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/jointWriter.h rename to plugin/pxr/maya/plugin/pxrUsdTranslators/jointWriter.h index 1fb81cc7c5..ba9ecf78a2 100644 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/jointWriter.h +++ b/plugin/pxr/maya/plugin/pxrUsdTranslators/jointWriter.h @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDTRANSLATORS_JOINT_WRITER_H #define PXRUSDTRANSLATORS_JOINT_WRITER_H diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/lightReader.cpp b/plugin/pxr/maya/plugin/pxrUsdTranslators/lightReader.cpp similarity index 63% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/lightReader.cpp rename to plugin/pxr/maya/plugin/pxrUsdTranslators/lightReader.cpp index 629c8f889c..bd964da7b2 100644 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/lightReader.cpp +++ b/plugin/pxr/maya/plugin/pxrUsdTranslators/lightReader.cpp @@ -1,25 +1,17 @@ // // Copyright 2019 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxr/usd/usdLux/diskLight.h" #include "pxr/usd/usdLux/distantLight.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/lightWriter.cpp b/plugin/pxr/maya/plugin/pxrUsdTranslators/lightWriter.cpp similarity index 57% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/lightWriter.cpp rename to plugin/pxr/maya/plugin/pxrUsdTranslators/lightWriter.cpp index 5811ffb5b2..9644e799bb 100644 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/lightWriter.cpp +++ b/plugin/pxr/maya/plugin/pxrUsdTranslators/lightWriter.cpp @@ -1,25 +1,17 @@ // // Copyright 2019 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "usdMaya/translatorRfMLight.h" #include "usdMaya/primWriterRegistry.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/locatorWriter.cpp b/plugin/pxr/maya/plugin/pxrUsdTranslators/locatorWriter.cpp similarity index 60% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/locatorWriter.cpp rename to plugin/pxr/maya/plugin/pxrUsdTranslators/locatorWriter.cpp index 5522e3aa85..c27ca2f96c 100644 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/locatorWriter.cpp +++ b/plugin/pxr/maya/plugin/pxrUsdTranslators/locatorWriter.cpp @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxr/pxr.h" #include "pxrUsdTranslators/locatorWriter.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/locatorWriter.h b/plugin/pxr/maya/plugin/pxrUsdTranslators/locatorWriter.h similarity index 60% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/locatorWriter.h rename to plugin/pxr/maya/plugin/pxrUsdTranslators/locatorWriter.h index 76ecd8706d..2b7a9b6614 100644 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/locatorWriter.h +++ b/plugin/pxr/maya/plugin/pxrUsdTranslators/locatorWriter.h @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDTRANSLATORS_LOCATOR_WRITER_H #define PXRUSDTRANSLATORS_LOCATOR_WRITER_H diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/materialReader.cpp b/plugin/pxr/maya/plugin/pxrUsdTranslators/materialReader.cpp similarity index 50% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/materialReader.cpp rename to plugin/pxr/maya/plugin/pxrUsdTranslators/materialReader.cpp index 675757d03a..664ac3fcba 100644 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/materialReader.cpp +++ b/plugin/pxr/maya/plugin/pxrUsdTranslators/materialReader.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxr/pxr.h" #include "usdMaya/primReaderRegistry.h" diff --git a/plugin/pxr/maya/plugin/pxrUsdTranslators/meshReader.cpp b/plugin/pxr/maya/plugin/pxrUsdTranslators/meshReader.cpp new file mode 100644 index 0000000000..091de21884 --- /dev/null +++ b/plugin/pxr/maya/plugin/pxrUsdTranslators/meshReader.cpp @@ -0,0 +1,38 @@ +// +// Copyright 2016 Pixar +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +#include "pxr/pxr.h" +#include "usdMaya/primReaderRegistry.h" +#include "usdMaya/translatorMesh.h" + +#include "pxr/usd/usdGeom/mesh.h" + +PXR_NAMESPACE_OPEN_SCOPE + + +PXRUSDMAYA_DEFINE_READER(UsdGeomMesh, args, context) +{ + const UsdPrim& usdPrim = args.GetUsdPrim(); + MObject parentNode = context->GetMayaNode(usdPrim.GetPath().GetParentPath(), true); + return UsdMayaTranslatorMesh::Create( + UsdGeomMesh(usdPrim), + parentNode, + args, + context); +} + + +PXR_NAMESPACE_CLOSE_SCOPE + diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/meshWriter.cpp b/plugin/pxr/maya/plugin/pxrUsdTranslators/meshWriter.cpp similarity index 95% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/meshWriter.cpp rename to plugin/pxr/maya/plugin/pxrUsdTranslators/meshWriter.cpp index 6ee27a9fba..503e269a11 100644 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/meshWriter.cpp +++ b/plugin/pxr/maya/plugin/pxrUsdTranslators/meshWriter.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxr/pxr.h" #include "pxrUsdTranslators/meshWriter.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/meshWriter.h b/plugin/pxr/maya/plugin/pxrUsdTranslators/meshWriter.h similarity index 88% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/meshWriter.h rename to plugin/pxr/maya/plugin/pxrUsdTranslators/meshWriter.h index 4eefae0028..6e38b36ea3 100644 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/meshWriter.h +++ b/plugin/pxr/maya/plugin/pxrUsdTranslators/meshWriter.h @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDTRANSLATORS_MESH_WRITER_H #define PXRUSDTRANSLATORS_MESH_WRITER_H diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/meshWriter_Primvars.cpp b/plugin/pxr/maya/plugin/pxrUsdTranslators/meshWriter_Primvars.cpp similarity index 96% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/meshWriter_Primvars.cpp rename to plugin/pxr/maya/plugin/pxrUsdTranslators/meshWriter_Primvars.cpp index 50cc51dc7e..06ce705f99 100644 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/meshWriter_Primvars.cpp +++ b/plugin/pxr/maya/plugin/pxrUsdTranslators/meshWriter_Primvars.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxrUsdTranslators/meshWriter.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/meshWriter_Skin.cpp b/plugin/pxr/maya/plugin/pxrUsdTranslators/meshWriter_Skin.cpp similarity index 94% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/meshWriter_Skin.cpp rename to plugin/pxr/maya/plugin/pxrUsdTranslators/meshWriter_Skin.cpp index 2f8fb2f5de..de98ab20ad 100644 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/meshWriter_Skin.cpp +++ b/plugin/pxr/maya/plugin/pxrUsdTranslators/meshWriter_Skin.cpp @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxr/pxr.h" #include "pxrUsdTranslators/meshWriter.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/meshWriter_Subdiv.cpp b/plugin/pxr/maya/plugin/pxrUsdTranslators/meshWriter_Subdiv.cpp similarity index 82% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/meshWriter_Subdiv.cpp rename to plugin/pxr/maya/plugin/pxrUsdTranslators/meshWriter_Subdiv.cpp index bc92572ead..26e5742687 100644 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/meshWriter_Subdiv.cpp +++ b/plugin/pxr/maya/plugin/pxrUsdTranslators/meshWriter_Subdiv.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxr/pxr.h" #include "pxrUsdTranslators/meshWriter.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/nurbsCurveWriter.cpp b/plugin/pxr/maya/plugin/pxrUsdTranslators/nurbsCurveWriter.cpp similarity index 88% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/nurbsCurveWriter.cpp rename to plugin/pxr/maya/plugin/pxrUsdTranslators/nurbsCurveWriter.cpp index 85d1686f3a..7efa826c39 100644 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/nurbsCurveWriter.cpp +++ b/plugin/pxr/maya/plugin/pxrUsdTranslators/nurbsCurveWriter.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxr/pxr.h" #include "pxrUsdTranslators/nurbsCurveWriter.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/nurbsCurveWriter.h b/plugin/pxr/maya/plugin/pxrUsdTranslators/nurbsCurveWriter.h similarity index 56% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/nurbsCurveWriter.h rename to plugin/pxr/maya/plugin/pxrUsdTranslators/nurbsCurveWriter.h index eea0326ffe..6cfbcc220c 100644 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/nurbsCurveWriter.h +++ b/plugin/pxr/maya/plugin/pxrUsdTranslators/nurbsCurveWriter.h @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDTRANSLATORS_NURBS_CURVE_WRITER_H #define PXRUSDTRANSLATORS_NURBS_CURVE_WRITER_H diff --git a/plugin/pxr/maya/plugin/pxrUsdTranslators/nurbsCurvesReader.cpp b/plugin/pxr/maya/plugin/pxrUsdTranslators/nurbsCurvesReader.cpp new file mode 100644 index 0000000000..b7916b3609 --- /dev/null +++ b/plugin/pxr/maya/plugin/pxrUsdTranslators/nurbsCurvesReader.cpp @@ -0,0 +1,37 @@ +// +// Copyright 2016 Pixar +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +#include "pxr/pxr.h" +#include "usdMaya/primReaderRegistry.h" +#include "usdMaya/translatorCurves.h" + +#include "pxr/usd/usdGeom/nurbsCurves.h" + +PXR_NAMESPACE_OPEN_SCOPE + + +PXRUSDMAYA_DEFINE_READER(UsdGeomNurbsCurves, args, context) +{ + const UsdPrim& usdPrim = args.GetUsdPrim(); + MObject parentNode = context->GetMayaNode(usdPrim.GetPath().GetParentPath(), true); + return UsdMayaTranslatorCurves::Create( + UsdGeomCurves(usdPrim), + parentNode, + args, + context); +} + +PXR_NAMESPACE_CLOSE_SCOPE + diff --git a/plugin/pxr/maya/plugin/pxrUsdTranslators/nurbsPatchReader.cpp b/plugin/pxr/maya/plugin/pxrUsdTranslators/nurbsPatchReader.cpp new file mode 100644 index 0000000000..1a36f6240b --- /dev/null +++ b/plugin/pxr/maya/plugin/pxrUsdTranslators/nurbsPatchReader.cpp @@ -0,0 +1,41 @@ +// +// Copyright 2016 Pixar +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +#include "pxr/pxr.h" +#include "usdMaya/primReaderRegistry.h" +#include "usdMaya/translatorNurbsPatch.h" + +#include "pxr/usd/usd/prim.h" +#include "pxr/usd/usdGeom/nurbsPatch.h" + +#include + +PXR_NAMESPACE_OPEN_SCOPE + + + +PXRUSDMAYA_DEFINE_READER(UsdGeomNurbsPatch, args, context) +{ + const UsdPrim& usdPrim = args.GetUsdPrim(); + MObject parentNode = context->GetMayaNode(usdPrim.GetPath().GetParentPath(), true); + return UsdMayaTranslatorNurbsPatch::Read( + UsdGeomNurbsPatch(usdPrim), + parentNode, + args, + context); +} + +PXR_NAMESPACE_CLOSE_SCOPE + diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/nurbsSurfaceWriter.cpp b/plugin/pxr/maya/plugin/pxrUsdTranslators/nurbsSurfaceWriter.cpp similarity index 94% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/nurbsSurfaceWriter.cpp rename to plugin/pxr/maya/plugin/pxrUsdTranslators/nurbsSurfaceWriter.cpp index 0a0f6b578d..5f95280736 100644 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/nurbsSurfaceWriter.cpp +++ b/plugin/pxr/maya/plugin/pxrUsdTranslators/nurbsSurfaceWriter.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxr/pxr.h" #include "pxrUsdTranslators/nurbsSurfaceWriter.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/nurbsSurfaceWriter.h b/plugin/pxr/maya/plugin/pxrUsdTranslators/nurbsSurfaceWriter.h similarity index 56% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/nurbsSurfaceWriter.h rename to plugin/pxr/maya/plugin/pxrUsdTranslators/nurbsSurfaceWriter.h index 3cd0223fbb..908541b9a6 100644 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/nurbsSurfaceWriter.h +++ b/plugin/pxr/maya/plugin/pxrUsdTranslators/nurbsSurfaceWriter.h @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDTRANSLATORS_NURBS_SURFACE_WRITER_H #define PXRUSDTRANSLATORS_NURBS_SURFACE_WRITER_H diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/overview.dox b/plugin/pxr/maya/plugin/pxrUsdTranslators/overview.dox similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/overview.dox rename to plugin/pxr/maya/plugin/pxrUsdTranslators/overview.dox diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/particleWriter.cpp b/plugin/pxr/maya/plugin/pxrUsdTranslators/particleWriter.cpp similarity index 93% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/particleWriter.cpp rename to plugin/pxr/maya/plugin/pxrUsdTranslators/particleWriter.cpp index efc91c7a56..d09d0b1c7e 100644 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/particleWriter.cpp +++ b/plugin/pxr/maya/plugin/pxrUsdTranslators/particleWriter.cpp @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxr/pxr.h" #include "pxrUsdTranslators/particleWriter.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/particleWriter.h b/plugin/pxr/maya/plugin/pxrUsdTranslators/particleWriter.h similarity index 59% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/particleWriter.h rename to plugin/pxr/maya/plugin/pxrUsdTranslators/particleWriter.h index 58c0ee7401..78b58bdf3a 100644 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/particleWriter.h +++ b/plugin/pxr/maya/plugin/pxrUsdTranslators/particleWriter.h @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #ifndef PXRUSDTRANSLATORS_PARTICLE_WRITER_H #define PXRUSDTRANSLATORS_PARTICLE_WRITER_H diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/plugInfo.json b/plugin/pxr/maya/plugin/pxrUsdTranslators/plugInfo.json similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/plugInfo.json rename to plugin/pxr/maya/plugin/pxrUsdTranslators/plugInfo.json diff --git a/plugin/pxr/maya/plugin/pxrUsdTranslators/plugin.cpp b/plugin/pxr/maya/plugin/pxrUsdTranslators/plugin.cpp new file mode 100644 index 0000000000..fbe52ee9a2 --- /dev/null +++ b/plugin/pxr/maya/plugin/pxrUsdTranslators/plugin.cpp @@ -0,0 +1,39 @@ +// +// Copyright 2018 Pixar +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +#include "pxr/pxr.h" +#include "pxrUsdTranslators/api.h" + +#include +#include + + +PXR_NAMESPACE_USING_DIRECTIVE + + +PXRUSDTRANSLATORS_API +MStatus +initializePlugin(MObject obj) +{ + MFnPlugin plugin(obj, "Pixar", "1.0", "Any"); + return MStatus::kSuccess; +} + +PXRUSDTRANSLATORS_API +MStatus +uninitializePlugin(MObject /*obj*/) +{ + return MStatus::kSuccess; +} diff --git a/plugin/pxr/maya/plugin/pxrUsdTranslators/scopeReader.cpp b/plugin/pxr/maya/plugin/pxrUsdTranslators/scopeReader.cpp new file mode 100644 index 0000000000..5af9a61897 --- /dev/null +++ b/plugin/pxr/maya/plugin/pxrUsdTranslators/scopeReader.cpp @@ -0,0 +1,46 @@ +// +// Copyright 2018 Pixar +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +#include "pxr/pxr.h" +#include "usdMaya/primReaderRegistry.h" +#include "usdMaya/translatorUtil.h" + +#include "pxr/usd/usd/prim.h" +#include "pxr/usd/usdGeom/scope.h" + +#include + +PXR_NAMESPACE_OPEN_SCOPE + +PXRUSDMAYA_DEFINE_READER(UsdGeomScope, args, context) +{ + const UsdPrim& usdPrim = args.GetUsdPrim(); + MObject parentNode = context->GetMayaNode( + usdPrim.GetPath().GetParentPath(), true); + + MStatus status; + MObject mayaNode; + return UsdMayaTranslatorUtil::CreateDummyTransformNode( + usdPrim, + parentNode, + /*importTypeName*/ true, + args, + context, + &status, + &mayaNode); +} + +PXR_NAMESPACE_CLOSE_SCOPE + diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/skelReader.cpp b/plugin/pxr/maya/plugin/pxrUsdTranslators/skelReader.cpp similarity index 88% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/skelReader.cpp rename to plugin/pxr/maya/plugin/pxrUsdTranslators/skelReader.cpp index 26438b3cd2..542244b9d3 100644 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/skelReader.cpp +++ b/plugin/pxr/maya/plugin/pxrUsdTranslators/skelReader.cpp @@ -1,25 +1,17 @@ // // Copyright 2018 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxr/pxr.h" #include "usdMaya/primReaderRegistry.h" diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/testenv/ScopeTest/Scopes.usda b/plugin/pxr/maya/plugin/pxrUsdTranslators/testenv/ScopeTest/Scopes.usda similarity index 100% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/testenv/ScopeTest/Scopes.usda rename to plugin/pxr/maya/plugin/pxrUsdTranslators/testenv/ScopeTest/Scopes.usda diff --git a/plugin/pxr/maya/plugin/pxrUsdTranslators/testenv/testPxrUsdTranslators.py b/plugin/pxr/maya/plugin/pxrUsdTranslators/testenv/testPxrUsdTranslators.py new file mode 100644 index 0000000000..04fef4eb90 --- /dev/null +++ b/plugin/pxr/maya/plugin/pxrUsdTranslators/testenv/testPxrUsdTranslators.py @@ -0,0 +1,40 @@ +#!/pxrpythonsubst +# +# Copyright 2018 Pixar +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + + +import unittest + +from maya import cmds +from maya import standalone + + +class testPxrUsdTranslators(unittest.TestCase): + + @classmethod + def setUpClass(cls): + standalone.initialize('usd') + + @classmethod + def tearDownClass(cls): + standalone.uninitialize() + + def testLoads(self): + self.assertEqual(cmds.loadPlugin('pxrUsdTranslators'), + ["pxrUsdTranslators"]) + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/testenv/testPxrUsdTranslatorsScope.py b/plugin/pxr/maya/plugin/pxrUsdTranslators/testenv/testPxrUsdTranslatorsScope.py similarity index 81% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/testenv/testPxrUsdTranslatorsScope.py rename to plugin/pxr/maya/plugin/pxrUsdTranslators/testenv/testPxrUsdTranslatorsScope.py index 6c8cd04177..b1e942debe 100644 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/testenv/testPxrUsdTranslatorsScope.py +++ b/plugin/pxr/maya/plugin/pxrUsdTranslators/testenv/testPxrUsdTranslatorsScope.py @@ -2,25 +2,17 @@ # # Copyright 2018 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/testenv/testPxrUsdTranslatorsUnloadReload.py b/plugin/pxr/maya/plugin/pxrUsdTranslators/testenv/testPxrUsdTranslatorsUnloadReload.py similarity index 60% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/testenv/testPxrUsdTranslatorsUnloadReload.py rename to plugin/pxr/maya/plugin/pxrUsdTranslators/testenv/testPxrUsdTranslatorsUnloadReload.py index 8b4823db25..3c90d3cc4d 100644 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/testenv/testPxrUsdTranslatorsUnloadReload.py +++ b/plugin/pxr/maya/plugin/pxrUsdTranslators/testenv/testPxrUsdTranslatorsUnloadReload.py @@ -2,25 +2,17 @@ # # Copyright 2018 Pixar # -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # import os diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/xformReader.cpp b/plugin/pxr/maya/plugin/pxrUsdTranslators/xformReader.cpp similarity index 53% rename from plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/xformReader.cpp rename to plugin/pxr/maya/plugin/pxrUsdTranslators/xformReader.cpp index 40a4dc5117..0cb8885b63 100644 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/xformReader.cpp +++ b/plugin/pxr/maya/plugin/pxrUsdTranslators/xformReader.cpp @@ -1,25 +1,17 @@ // // Copyright 2016 Pixar // -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // #include "pxr/pxr.h" #include "usdMaya/primReaderRegistry.h" diff --git a/plugins/PXR_USDMaya/pxr/pxr.h.in b/plugin/pxr/pxr/pxr.h.in similarity index 100% rename from plugins/PXR_USDMaya/pxr/pxr.h.in rename to plugin/pxr/pxr/pxr.h.in diff --git a/plugins/ADSK_USDMaya/CMakeLists.txt b/plugins/ADSK_USDMaya/CMakeLists.txt deleted file mode 100644 index 9d8496c62b..0000000000 --- a/plugins/ADSK_USDMaya/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -message("========== ADSK USD Plugin ==========") - -set(INSTALL_DIR_SUFFIX MayaUSD) - -#============================================================================== -# Packages -#============================================================================== -find_package(MayaCoreUSD REQUIRED) -find_package(Maya REQUIRED) - -add_subdirectory(plugin) -add_subdirectory(python) diff --git a/plugins/ADSK_USDMaya/plugin/CMakeLists.txt b/plugins/ADSK_USDMaya/plugin/CMakeLists.txt deleted file mode 100644 index 736b41d9db..0000000000 --- a/plugins/ADSK_USDMaya/plugin/CMakeLists.txt +++ /dev/null @@ -1,55 +0,0 @@ -set(PLUGIN_PACKAGE mayaUsd) - -add_library(${PLUGIN_PACKAGE} MODULE - plugin.cpp -) - -target_compile_definitions(${PLUGIN_PACKAGE} - PRIVATE - MAYAUSD_PLUGIN_EXPORT -) - -target_include_directories(${PLUGIN_PACKAGE} - PRIVATE - ${MAYA_INCLUDE_DIRS} - ${MAYAUSD_INCLUDE_DIR} -) - -target_link_libraries(${PLUGIN_PACKAGE} - PRIVATE - ${MAYA_LIBRARIES} - ${MAYAUSD_LIBRARIES} -) - -if(MSVC) - set_target_properties(${PLUGIN_PACKAGE} PROPERTIES SUFFIX ".mll") -elseif(APPLE) - set(CMAKE_MACOSX_RPATH ON) - set_target_properties(${PLUGIN_PACKAGE} - PROPERTIES - PREFIX "" - SUFFIX ".bundle" - BUILD_WITH_INSTALL_RPATH TRUE - INSTALL_RPATH "@loader_path/../lib") -else() - set(rpath "$ORIGIN:$ORIGIN/../lib") - if (CMAKE_INSTALL_RPATH) - set(rpath "${CMAKE_INSTALL_RPATH}:${rpath}") - endif() - set_target_properties(${PLUGIN_PACKAGE} - PROPERTIES - PREFIX "" - INSTALL_RPATH "${rpath}" - ) -endif() - -install(TARGETS - ${PLUGIN_PACKAGE} - LIBRARY - DESTINATION ${INSTALL_DIR_SUFFIX}/plugin - RUNTIME - DESTINATION ${INSTALL_DIR_SUFFIX}/plugin -) -if(MSVC) - install(FILES $ DESTINATION ${INSTALL_DIR_SUFFIX}/plugin OPTIONAL) -endif() diff --git a/plugins/ADSK_USDMaya/plugin/plugin.cpp b/plugins/ADSK_USDMaya/plugin/plugin.cpp deleted file mode 100644 index b73cae7877..0000000000 --- a/plugins/ADSK_USDMaya/plugin/plugin.cpp +++ /dev/null @@ -1,24 +0,0 @@ -// =========================================================================== -// Copyright 2019 Autodesk, Inc. All rights reserved. -// -// Use of this software is subject to the terms of the Autodesk license -// agreement provided at the time of installation or download, or which -// otherwise accompanies this software in either electronic or hard copy form. -// =========================================================================== - -#include "mayaUsd/MayaUsdApi.h" - -#include -#include - -MAYAUSD_PLUGIN_PUBLIC -MStatus initializePlugin(MObject obj) -{ - return MS::kSuccess; -} - -MAYAUSD_PLUGIN_PUBLIC -MStatus uninitializePlugin(MObject obj) -{ - return MS::kSuccess; -} diff --git a/plugins/ADSK_USDMaya/python/CMakeLists.txt b/plugins/ADSK_USDMaya/python/CMakeLists.txt deleted file mode 100644 index aafa843392..0000000000 --- a/plugins/ADSK_USDMaya/python/CMakeLists.txt +++ /dev/null @@ -1,27 +0,0 @@ -#- -# ======================================================================= -# Copyright 2019 Autodesk, Inc. All rights reserved. -# -# This computer source code and related instructions and comments are the -# unpublished confidential and proprietary information of Autodesk, Inc. -# and are protected under applicable copyright and trade secret law. They -# may not be disclosed to, copied or used by any third party without the -# prior written consent of Autodesk, Inc. -# ======================================================================= -#+ - -# Ufe and USD Python plugins -set(python_plugin_files - maya-ufe-usd-plugin.py -) - -# Ufe python scripts -set(python_script_files - ufeScripts/usdRunTime.py - ufeScripts/usdSubject.py - ufeScripts/usdXformOpCmds.py - ufeScripts/__init__.py -) - -install(FILES ${python_plugin_files} DESTINATION ${INSTALL_DIR_SUFFIX}/python) -install(FILES ${python_script_files} DESTINATION ${INSTALL_DIR_SUFFIX}/python/ufeScripts) diff --git a/plugins/ADSK_USDMaya/python/maya-ufe-usd-plugin.py b/plugins/ADSK_USDMaya/python/maya-ufe-usd-plugin.py deleted file mode 100644 index 277972d4d5..0000000000 --- a/plugins/ADSK_USDMaya/python/maya-ufe-usd-plugin.py +++ /dev/null @@ -1,57 +0,0 @@ -#!/usr/bin/env python - -#- -# =========================================================================== -# Copyright 2018 Autodesk, Inc. All rights reserved. -# -# Use of this software is subject to the terms of the Autodesk license -# agreement provided at the time of installation or download, or which -# otherwise accompanies this software in either electronic or hard copy form. -# =========================================================================== -#+ - -#- -# =========================================================================== -# WARNING: PROTOTYPE CODE -# -# The code in this file is intended as an engineering prototype, to demonstrate -# UFE integration in Maya. Its performance and stability may make it -# unsuitable for production use. -# -# Autodesk believes production quality would be better achieved with a C++ -# version of this code. -# -# =========================================================================== -#+ - -try: - import ufe -except: - print "Unable to load ufe - Make sure the ufe path is added to PYTHONPATH" - raise - - -from ufeScripts import usdRunTime -from ufeScripts import usdSubject -import sys -import maya.api.OpenMaya as om - -def maya_useNewAPI(): - """ - The presence of this function tells Maya that the plugin produces, and - expects to be passed, objects created using the Maya Python API 2.0. - """ - pass - -def initializePlugin(obj): - plugin = om.MFnPlugin(obj, "Autodesk", "1.0", "Any") - usdRunTime.initialize() - usdSubject.initialize() - -def uninitializePlugin(obj): - usdRunTime.finalize() - usdSubject.finalize() - del sys.modules['usdRunTime'] - del sys.modules['usdSubject'] - - diff --git a/plugins/ADSK_USDMaya/python/ufeScripts/__init__.py b/plugins/ADSK_USDMaya/python/ufeScripts/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/plugins/ADSK_USDMaya/python/ufeScripts/usdRunTime.py b/plugins/ADSK_USDMaya/python/ufeScripts/usdRunTime.py deleted file mode 100644 index a04797c672..0000000000 --- a/plugins/ADSK_USDMaya/python/ufeScripts/usdRunTime.py +++ /dev/null @@ -1,868 +0,0 @@ -#!/usr/bin/env python - -#- -# =========================================================================== -# Copyright 2018 Autodesk, Inc. All rights reserved. -# -# Use of this software is subject to the terms of the Autodesk license -# agreement provided at the time of installation or download, or which -# otherwise accompanies this software in either electronic or hard copy form. -# =========================================================================== -#+ - -#- -# =========================================================================== -# WARNING: PROTOTYPE CODE -# -# The code in this file is intended as an engineering prototype, to demonstrate -# UFE integration in Maya. Its performance and stability may make it -# unsuitable for production use. -# -# Autodesk believes production quality would be better achieved with a C++ -# version of this code. -# -# =========================================================================== -#+ - -'''Universal Front End USD run-time integration. - -This module provides integration of the Maya run-time into the Universal -Front End. -''' - -import ufe -import usdXformOpCmds - -from pxr import Sdf -from pxr import UsdGeom -from pxr import UsdMaya - -import maya.cmds as cmds - -import re -import sys -from collections import deque - -# Maya's UFE run-time name and ID. -kMayaRunTimeName = 'Maya-DG' -mayaRtid = 0 - -# Register this run-time with UFE under the following name. -kUSDRunTimeName = 'USD' - -# Our run-time ID, allocated by UFE at registration time. Initialize it -# with illegal 0 value. -USDRtid = 0 - -kIllegalUSDPath = 'Illegal USD run-time path %s.' - -kNotGatewayNodePath = 'Tail of path %s is not a gateway node.' - -# The normal Maya hierarchy handler, which we decorate for ProxyShape support. -# Keep a reference to it to restore on finalization. -mayaHierarchyHandler = None - -# Pixar or AL proxy shape abstraction, to support use of USD proxy shape with -# either plugin. -proxyShapeHandler = None - -# FIXME Python binding lifescope. -# -# In code where we return a Python object to C++ code, if we don't keep a -# Python object reference in Python, the Python object is destroyed, and only -# the C++ base class survives. This "slices" the additional Python derived -# class functionality out of the object, and only the base class functionality -# remains. See -# -# https://github.com/pybind/pybind11/issues/1145 -# -# for a pybind11 pull request that describes the problem and fixes it. If this -# pull request is merged into pybind11, we should update to that version and -# confirm the fix. -# -# In our case, this situation happens when returning a newly-created Python -# UsdSceneItem directly to C++ code. Any such code should use the -# keepAlive mechanism. Note that it is too early to be done in the -# UsdSceneItem __init__, as the keepAlive cleanup code checks that the item -# is in the global selection, which is obviously not the case when still in -# __init__. PPT, 23-Nov-2017. -# -# Selection items to keep alive. -_keepAlive = {} - -def keepAlive(item): - '''Keep argument item alive by adding it to the keep alive cache. - - Before adding item to the cache, it is cleared of items no longer in the - selection. - ''' - global _keepAlive - - # First, clean out cache of items no longer needed. - # As of 8-Jan-2018, this causes lifescope issues, so "leak" items in the - # keepAlive map. Since this Python module is temporary, pending a - # permanent C++ implementation, not investigating. PPT. -# paths = _keepAlive.keys() -# globalSelection = ufe.GlobalSelection.get() -# for path in paths: -# if path not in globalSelection: -# del _keepAlive[path] - - # Next, add in new item. - _keepAlive[item.path()] = item - -# Map of AL_usdmaya_ProxyShape UFE path to corresponding stage. -pathToStage = {} - -def getStage(path): - '''Get USD stage corresponding to argument Maya Dag path. - - A stage is bound to a single Dag proxy shape. - ''' - return pathToStage.get(path) - -def ufePathToPrim(path): - '''Return the USD prim corresponding to the argument UFE path.''' - # Assume that there are only two segments in the path, the first a Maya - # Dag path segment to the proxy shape, which identifies the stage, and - # the second the USD segment. - segments = path.segments - assert len(segments) == 2, kIllegalUSDPath % str(path) - dagSegment = segments[0] - stage = getStage(ufe.Path([dagSegment])) - return stage.GetPrimAtPath(str(segments[1])) - - -def isRootChild(path): - segments = path.segments - assert len(segments) == 2, kIllegalUSDPath % str(path) - return len(segments[1]) == 1 - -def defPrimSpecLayer(prim): - '''Return the highest-priority layer where the prim has a def primSpec.''' - - # Iterate over the layer stack, starting at the highest-priority layer. - # The source layer is the one in which there exists a def primSpec, not - # an over. - layerStack = prim.GetStage().GetLayerStack() - defLayer = None - for layer in layerStack: - primSpec = layer.GetPrimAtPath(prim.GetPath()) - if primSpec is not None and primSpec.specifier == Sdf.SpecifierDef: - defLayer = layer - break - return defLayer - -def createSiblingSceneItem(ufeSrcPath, siblingName): - ufeSiblingPath = ufeSrcPath.sibling(ufe.PathComponent(siblingName)) - return UsdSceneItem.create(ufeSiblingPath, ufePathToPrim(ufeSiblingPath)) - -# Compiled regular expression to find a numerical suffix to a path component. -# It searches for any number of characters followed by a single non-numeric, -# then one or more digits at end of string. -_reProg = re.compile('(.*)([^0-9])([0-9]+)$') - -def uniqueName(existingNames, srcName): - # Split the source name into a base name and a numerical suffix (set to - # 1 if absent). Increment the numerical suffix until name is unique. - match = _reProg.search(srcName) - (base, suffix) = (srcName, 1) if match is None else \ - (match.group(1)+match.group(2), int(match.group(3))+1) - dstName = base + str(suffix) - while dstName in existingNames: - suffix += 1 - dstName = base + str(suffix) - return dstName - -_inPathChange = False - -class InPathChange(object): - def __enter__(self): - global _inPathChange - _inPathChange = True - - def __exit__(self, *args): - global _inPathChange - _inPathChange = False - -# Provide a single interface for the Pixar proxy shape or the Animal Logic -# proxy shape node. -class ProxyShapeHandlerBase(object): - def gatewayNodeType(self): - '''Type of the Maya shape node at the root of a USD hierarchy.''' - return self.kMayaUsdGatewayNodeType - - def getAllNames(self): - return cmds.ls(type=self.kMayaUsdGatewayNodeType, long=True) - -class PxrProxyShapeHandler(ProxyShapeHandlerBase): - kMayaUsdGatewayNodeType = 'pxrUsdProxyShape' - - def nameToStage(self, name): - return UsdMaya.GetPrim(name).GetStage() - - def getAllStages(self): - # According to Pixar, the following should work: - # return UsdMaya.StageCache.Get().GetAllStages() - # but after a file open of a scene with one or more Pixar proxy shapes, - # returns an empty list. To be investigated, PPT, 28-Feb-2019. - - # When using the AL plugin, the following line crashes Maya, so it's - # a Pixar-only solution, not a general one. PPT, 28-Feb-2019. - return [UsdMaya.GetPrim(psn).GetStage() for psn in self.getAllNames()] - -class ALProxyShapeHandler(ProxyShapeHandlerBase): - kMayaUsdGatewayNodeType = 'AL_usdmaya_ProxyShape' - - def nameToStage(self, name): - from AL import usdmaya as AL_USDMaya - return AL_USDMaya.ProxyShape.getByName(name).getUsdStage() - - def getAllStages(self): - from AL import usdmaya as AL_USDMaya - stageCache = AL_USDMaya.StageCache.Get() - return stageCache.GetAllStages() - -def inPathChange(): - return _inPathChange - -def uniqueChildName(parent, childPath): - '''Return a unique child name. - - parent must be a UsdSceneItem.''' - childrenName = set(child.GetName() for child in parent.prim().GetChildren()) - childName = str(childPath.back()) - if childName in childrenName: - childName = uniqueName(childrenName, childName) - return childName - -class UsdSceneItem(ufe.SceneItem): - def __init__(self, path, prim): - super(UsdSceneItem, self).__init__(path) - self._prim = prim - # FIXME Python binding lifescope. - keepAlive(self) - - @staticmethod - def create(path, prim): - '''Create a UsdSceneItem from a UFE path and a USD prim.''' - # Are we already keeping an item like this alive? If so, use it. - item = _keepAlive.get(path) - if item is None: - item = UsdSceneItem(path, prim) - return item - - def prim(self): - return self._prim - - def nodeType(self): - return self._prim.GetTypeName() - -class UsdHierarchy(ufe.Hierarchy): - '''USD run-time hierarchy interface. - - This class implements the hierarchy interface for normal USD prims, using - standard USD calls to obtain a prim's parent and children. - ''' - def __init__(self): - super(UsdHierarchy, self).__init__() - - def setItem(self, item): - self._path = item.path() - self._prim = item.prim() - self._item = item - - def sceneItem(self): - return self._item - - def path(self): - return self._path - - def hasChildren(self): - return self._prim.GetChildren() != [] - - def parent(self): - return UsdSceneItem.create(self._path.pop(), self._prim.GetParent()) - - def children(self): - # Return USD children only, i.e. children within this run-time. - usdChildren = self._prim.GetChildren() - - # The following is the desired code, lifescope issues notwithstanding. - # children = [UsdSceneItem(self._path + child.GetName(), child) - # for child in usdChildren] - children = [UsdSceneItem.create(self._path + child.GetName(), child) - for child in usdChildren] - return children - - def appendChild(self, child): - # First, check if we need to rename the child. - childName = uniqueChildName(self.sceneItem(), child.path()) - - # Set up all paths to perform the reparent. - prim = child.prim() - stage = prim.GetStage() - ufeSrcPath = child.path() - usdSrcPath = prim.GetPath() - ufeDstPath = self.path() + childName - usdDstPath = self._prim.GetPath().AppendChild(childName) - layer = defPrimSpecLayer(prim) - if layer is None: - raise RuntimeError("No prim found at %s" % usdSrcPath) - - # In USD, reparent is implemented like rename, using copy to - # destination, then remove from source. See - # UsdUndoRenameCommand._rename comments for details. - with InPathChange(): - status = Sdf.CopySpec(layer, usdSrcPath, layer, usdDstPath) - if not status: - raise RuntimeError("Appending child %s to parent %s failed." % - (str(ufeSrcPath), str(self.path()))) - - stage.RemovePrim(usdSrcPath) - ufeDstItem = UsdSceneItem.create( - ufeDstPath, ufePathToPrim(ufeDstPath)) - notification = ufe.ObjectReparent(ufeDstItem, ufeSrcPath) - ufe.Scene.notifyObjectPathChange(notification) - - # FIXME No idea how to get the child prim index yet. PPT, 16-Aug-2018. - return ufe.AppendedChild(ufeDstItem, ufeSrcPath, 0) - - def createGroup(self, name): - '''Create a transform.''' - # According to Pixar, the following is more efficient when creating - # multiple transforms, because of the use of ChangeBlock(): - # with Sdf.ChangeBlock(): - # primSpec = Sdf.CreatePrimInLayer(layer, usdPath) - # primSpec.specifier = Sdf.SpecifierDef - # primSpec.typeName = 'Xform' - - # Rename the new group for uniqueness, if needed. - path = self.path() + name - childName = uniqueChildName(self.sceneItem(), path) - - # Next, get the stage corresponding to the path. - segments = path.segments - assert len(segments) == 2, kIllegalUSDPath % str(path) - dagSegment = segments[0] - stage = getStage(ufe.Path([dagSegment])) - - # Build the corresponding USD path and create the USD group prim. - usdPath = self.sceneItem().prim().GetPath().AppendChild(childName) - prim = UsdGeom.Xform.Define(stage, usdPath).GetPrim() - - # Create a UFE scene item from the prim. - ufeChildPath = self.path() + childName - return UsdSceneItem.create(ufeChildPath, prim) - - # FIXME Python binding lifescope. See UsdSceneItemOps.undoCommands. - _MAX_UNDO_COMMANDS = 10000 - undoCommands = deque(maxlen=_MAX_UNDO_COMMANDS) - - def createGroupCmd(self, name): - createGroupCmd = UsdUndoCreateGroupCommand(self.sceneItem(), name) - createGroupCmd.execute() - UsdHierarchy.undoCommands.append(createGroupCmd) - return ufe.Group(createGroupCmd.group(), createGroupCmd) - -class UsdRootChildHierarchy(UsdHierarchy): - '''USD run-time hierarchy interface for children of the USD root prim. - - This class modifies its base class implementation to return the Maya USD - gateway node as parent of USD prims that are children of the USD root prim. - ''' - def __init__(self): - super(UsdRootChildHierarchy, self).__init__() - - def parent(self): - # If we're a child of the root, our parent node in the path is a Maya - # node. Ask the Maya hierarchy interface to create a selection item - # for that path. - parentPath = self._path.pop() - assert parentPath.runTimeId() == mayaRtid, kNotGatewayNodePath % str(path) - - mayaHierarchyHandler = ufe.RunTimeMgr.instance().hierarchyHandler(mayaRtid) - return mayaHierarchyHandler.createItem(parentPath) - -class UsdHierarchyHandler(ufe.HierarchyHandler): - '''USD run-time hierarchy handler. - - This hierarchy handler is the standard USD run-time hierarchy handler. Its - only special behavior is to return a UsdRootChildHierarchy interface object - if it is asked for a hierarchy interface for a child of the USD root prim. - These prims are special because we define their parent to be the Maya USD - gateway node, which the UsdRootChildHierarchy interface implements. - ''' - def __init__(self): - super(UsdHierarchyHandler, self).__init__() - self._usdRootChildHierarchy = UsdRootChildHierarchy() - self._usdHierarchy = UsdHierarchy() - - def hierarchy(self, item): - if isRootChild(item.path()): - self._usdRootChildHierarchy.setItem(item) - return self._usdRootChildHierarchy - else: - self._usdHierarchy.setItem(item) - return self._usdHierarchy - - def createItem(self, path): - return UsdSceneItem.create(path, ufePathToPrim(path)) - -class ProxyShapeHierarchy(ufe.Hierarchy): - '''USD gateway node hierarchy interface. - - This class defines a hierarchy interface for a single kind of Maya node, - the USD gateway node. This node is special in that its parent is a Maya - node, but its children are children of the USD root prim. - ''' - def __init__(self, mayaHierarchyHandler): - super(ProxyShapeHierarchy, self).__init__() - self._mayaHierarchyHandler = mayaHierarchyHandler - - def setItem(self, item): - self._item = item - self._mayaHierarchy = self._mayaHierarchyHandler.hierarchy(item) - self._usdRootPrim = None - - def _getUsdRootPrim(self): - if self._usdRootPrim is None: - try: - self._usdRootPrim = getStage(self._item.path()).GetPrimAtPath('/'); - except: - # FIXME During AL_usdmaya_ProxyShapeImport, nodes (both Maya - # and USD) are being added (e.g. the proxy shape itself), but - # there is no stage yet, and there is no way to detect that a - # proxy shape import command is under way. PPT, 28-Sep-2018. - pass - return self._usdRootPrim - - def hasChildren(self): - rootPrim = self._getUsdRootPrim() - if not rootPrim: - return False - return len(rootPrim.GetChildren()) > 0 - - def parent(self): - return self._mayaHierarchy.parent() - - def children(self): - # Return children of the USD root. - rootPrim = self._getUsdRootPrim() - if not rootPrim: - return [] - usdChildren = rootPrim.GetChildren() - parentPath = self._item.path() - - # We must create selection items for our children. These will have as - # path the path of the proxy shape, with a single path segment of a - # single component appended to it. - # The following is the desired code, lifescope issues notwithstanding. - # children = [UsdSceneItem(parentPath + ufe.PathSegment( - # ufe.PathComponent(child.GetName()), USDRtid, '/'), child) for child - # in usdChildren] - children = [UsdSceneItem.create(parentPath + ufe.PathSegment( - ufe.PathComponent(child.GetName()), USDRtid, '/'), child) for child - in usdChildren] - return children - -class ProxyShapeHierarchyHandler(ufe.HierarchyHandler): - '''Maya run-time hierarchy handler with support for USD gateway node. - - This hierarchy handler is NOT a USD run-time hierarchy handler: it is a - Maya run-time hierarchy handler. It decorates the standard Maya run-time - hierarchy handler and replaces it, providing special behavior only if the - requested hierarchy interface is for the Maya to USD gateway node. In that - case, it returns a special ProxyShapeHierarchy interface object, which - knows how to handle USD children of the Maya ProxyShapeHierarchy node. - - For all other Maya nodes, this hierarchy handler simply delegates the work - to the standard Maya hierarchy handler it decorates, which returns a - standard Maya hierarchy interface object. - ''' - def __init__(self, mayaHierarchyHandler): - super(ProxyShapeHierarchyHandler, self).__init__() - self._mayaHierarchyHandler = mayaHierarchyHandler - self._proxyShapeHierarchy = ProxyShapeHierarchy(mayaHierarchyHandler) - - def hierarchy(self, item): - if item.nodeType() == proxyShapeHandler.gatewayNodeType(): - self._proxyShapeHierarchy.setItem(item) - return self._proxyShapeHierarchy - else: - return self._mayaHierarchyHandler.hierarchy(item) - - def createItem(self, path): - return self._mayaHierarchyHandler.createItem(path) - -class UsdTransform3d(ufe.Transform3d): - def __init__(self): - super(UsdTransform3d, self).__init__() - - def setItem(self, item): - self._prim = item.prim() - self._path = item.path() - self._item = item - - def sceneItem(self): - return self._item - - def path(self): - return self._path - - def translate(self, x, y, z): - usdXformOpCmds.translateOp(self._prim, self._path, x, y, z) - - def translation(self): - x, y, z = (0, 0, 0) - if self._prim.HasAttribute('xformOp:translate'): - # Initially, attribute can be created, but have no value. - v = self._prim.GetAttribute('xformOp:translate').Get() - if v is not None: - x, y, z = v - return ufe.Vector3d(x, y, z) - - # FIXME Python binding lifescope. Memento objects are returned directly to - # C++, which does not keep them alive. Use LIFO deque with maximum size to - # keep them alive without consuming an unbounded amount of memory. This - # hack will fail for more than _MAX_MEMENTOS objects. PPT, 12-Dec-2017. - _MAX_MEMENTOS = 10000 - mementos = deque(maxlen=_MAX_MEMENTOS) - - - def translateCmd(self): - # FIXME Python binding lifescope. Must keep command object alive. - translateCmd = usdXformOpCmds.UsdTranslateUndoableCommand(self._prim, self._path, self._item) - UsdTransform3d.mementos.append(translateCmd) - return translateCmd - - def rotate(self, x, y, z): - usdXformOpCmds.rotateOp(self._prim, self._path, x, y, z) - - def rotateCmd(self): - # FIXME Python binding lifescope. Must keep command object alive. - rotateCmd = usdXformOpCmds.UsdRotateUndoableCommand(self._prim, self._path, self._item) - UsdTransform3d.mementos.append(rotateCmd) - return rotateCmd - - def scale(self, x, y, z): - usdXformOpCmds.scaleOp(self._prim, self._path, x, y, z) - - def scaleCmd(self): - # FIXME Python binding lifescope. Must keep command object alive. - scaleCmd = usdXformOpCmds.UsdScaleUndoableCommand(self._prim, self._path, self._item) - UsdTransform3d.mementos.append(scaleCmd) - return scaleCmd - - def rotatePivotTranslate(self, x, y, z): - usdXformOpCmds.rotatePivotTranslateOp(self._prim, self._path, x, y, z) - - def rotatePivotTranslateCmd(self): - # FIXME Python binding lifescope. Must keep command object alive. - translateCmd = usdXformOpCmds.UsdRotatePivotTranslateUndoableCommand(self._prim, self._path, self._item) - UsdTransform3d.mementos.append(translateCmd) - return translateCmd - - def rotatePivot(self): - x, y, z = (0, 0, 0) - if self._prim.HasAttribute('xformOp:translate:pivot'): - # Initially, attribute can be created, but have no value. - v = self._prim.GetAttribute('xformOp:translate:pivot').Get() - if v is not None: - x, y, z = v - return ufe.Vector3d(x, y, z) - - def scalePivot(self): - return self.rotatePivot() - - def scalePivotTranslate(self, x, y, z): - return self.rotatePivotTranslate(x, y, z) - - - def segmentInclusiveMatrix(self): - return usdXformOpCmds.primToUfeXform(self._prim) - - def segmentExclusiveMatrix(self): - return usdXformOpCmds.primToUfeExclusiveXform(self._prim) - -class UsdTransform3dHandler(ufe.Transform3dHandler): - def __init__(self): - super(UsdTransform3dHandler, self).__init__() - self._usdTransform3d = UsdTransform3d() - - def transform3d(self, item): - self._usdTransform3d.setItem(item) - return self._usdTransform3d - -class UsdUndoDeleteCommand(ufe.UndoableCommand): - def __init__(self, prim): - super(UsdUndoDeleteCommand, self).__init__() - self._prim = prim - - def _perform(self, state): - self._prim.SetActive(state) - - def undo(self): - self._perform(True) - - def redo(self): - self._perform(False) - -class UsdUndoDuplicateCommand(ufe.UndoableCommand): - - def __init__(self, srcPrim, ufeSrcPath): - super(UsdUndoDuplicateCommand, self).__init__() - self._srcPrim = srcPrim - self._stage = srcPrim.GetStage() - self._ufeSrcPath = ufeSrcPath - (self._usdDstPath, self._layer) = self.primInfo(srcPrim) - - def usdDstPath(self): - return self._usdDstPath - - @staticmethod - def primInfo(srcPrim): - '''Return the USD destination path and layer.''' - parent = srcPrim.GetParent() - childrenName = set(child.GetName() for child in parent.GetChildren()) - # Find a unique name for the destination. If the source name already - # has a numerical suffix, increment it, otherwise append "1" to it. - dstName = uniqueName(childrenName, srcPrim.GetName()) - usdDstPath = parent.GetPath().AppendChild(dstName) - # Iterate over the layer stack, starting at the highest-priority layer. - # The source layer is the one in which there exists a def primSpec, not - # an over. An alternative would have beeen to call Sdf.CopySpec for - # each layer in which there is an over or a def, until we reach the - # layer with a def primSpec. This would preserve the visual appearance - # of the duplicate. PPT, 12-Jun-2018. - srcLayer = defPrimSpecLayer(srcPrim) - if srcLayer is None: - raise RuntimeError("No prim found at %s" % srcPrim.GetPath()) - return (usdDstPath, srcLayer) - - @staticmethod - def duplicate(layer, usdSrcPath, usdDstPath): - '''Duplicate the prim hierarchy at usdSrcPath. - - Returns True for success. - ''' - # We use the source layer as the destination. An alternate workflow - # would be the edit target layer be the destination: - # layer = self._stage.GetEditTarget().GetLayer() - return Sdf.CopySpec(layer, usdSrcPath, layer, usdDstPath) - - def undo(self): - # USD sends a ResyncedPaths notification after the prim is removed, but - # at that point the prim is no longer valid, and thus a UFE post delete - # notification is no longer possible. To respect UFE object delete - # notification semantics, which require the object to be alive when - # the notification is sent, we send a pre delete notification here. - notification = ufe.ObjectPreDelete(createSiblingSceneItem( - self._ufeSrcPath, self._usdDstPath.elementString)) - ufe.Scene.notifyObjectDelete(notification) - - self._stage.RemovePrim(self._usdDstPath) - - def redo(self): - # MAYA-92264: Pixar bug prevents redo from working. Try again with USD - # version 0.8.5 or later. PPT, 28-May-2018. - try: - self.duplicate(self._layer, self._srcPrim.GetPath(), self._usdDstPath) - except Exception as e: - print e - raise - -class UsdUndoRenameCommand(ufe.UndoableCommand): - - def __init__(self, srcItem, newName): - super(UsdUndoRenameCommand, self).__init__() - prim = srcItem.prim() - self._stage = prim.GetStage() - self._ufeSrcPath = srcItem.path() - self._usdSrcPath = prim.GetPath() - # Every call to rename() (through execute(), undo() or redo()) removes - # a prim, which becomes expired. Since USD UFE scene items contain a - # prim, we must recreate them after every call to rename. - self._ufeDstItem = None - self._usdDstPath = prim.GetParent().GetPath().AppendChild(str(newName)) - self._layer = defPrimSpecLayer(prim) - if self._layer is None: - raise RuntimeError("No prim found at %s" % prim.GetPath()) - - def renamedItem(self): - return self._ufeDstItem - - def rename(self, layer, ufeSrcPath, usdSrcPath, usdDstPath): - with InPathChange(): - self._rename(layer, ufeSrcPath, usdSrcPath, usdDstPath) - - def _rename(self, layer, ufeSrcPath, usdSrcPath, usdDstPath): - '''Rename the prim hierarchy at usdSrcPath to usdDstPath.''' - # We use the source layer as the destination. An alternate workflow - # would be the edit target layer be the destination: - # layer = self._stage.GetEditTarget().GetLayer() - status = Sdf.CopySpec(layer, usdSrcPath, layer, usdDstPath) - if status: - self._stage.RemovePrim(usdSrcPath) - # The renamed scene item is a "sibling" of its original name. - self._ufeDstItem = createSiblingSceneItem( - ufeSrcPath, usdDstPath.elementString) - # USD sends two ResyncedPaths() notifications, one for the CopySpec - # call, the other for the RemovePrim call (new name added, old name - # removed). Unfortunately, the rename semantics are lost: there is - # no notion that the two notifications belong to the same atomic - # change. Provide a single Rename notification ourselves here. - notification = ufe.ObjectRename(self._ufeDstItem, ufeSrcPath) - ufe.Scene.notifyObjectPathChange(notification) - - return status - - def undo(self): - # MAYA-92264: Pixar bug prevents undo from working. Try again with USD - # version 0.8.5 or later. PPT, 7-Jul-2018. - try: - self.rename(self._layer, self._ufeDstItem.path(), self._usdDstPath, - self._usdSrcPath) - except Exception as e: - print e - raise - - def redo(self): - self.rename(self._layer, self._ufeSrcPath, self._usdSrcPath, - self._usdDstPath) - -class UsdUndoCreateGroupCommand(ufe.UndoableCommand): - - def __init__(self, parentItem, name): - super(UsdUndoCreateGroupCommand, self).__init__() - self._parentItem = parentItem - self._name = name - self._group = None - - def group(self): - return self._group - - def undo(self): - if self._group is None: - return - - # See UsdUndoDuplicateCommand.undo() comments. - notification = ufe.ObjectPreDelete(self._group) - ufe.Scene.notifyObjectDelete(notification) - - prim = self._group.prim() - stage = prim.GetStage() - usdPath = prim.GetPath() - stage.RemovePrim(usdPath) - - self._group = None - - def redo(self): - hierarchy = ufe.Hierarchy.hierarchy(self._parentItem) - # See MAYA-92264: redo doesn't work. PPT, 19-Nov-2018. - self._group = hierarchy.createGroup(self._name) - -class UsdSceneItemOps(ufe.SceneItemOps): - def __init__(self): - super(UsdSceneItemOps, self).__init__() - - def setItem(self, item): - self._prim = item.prim() - self._path = item.path() - self._item = item - - def sceneItem(self): - return self._item - - def path(self): - return self._path - - # FIXME Python binding lifescope. Command objects are returned directly to - # C++, which does not keep them alive. Use LIFO deque with maximum size to - # keep them alive without consuming an unbounded amount of memory. This - # hack will fail for more than _MAX_UNDO_COMMANDS objects. - # PPT, 1-May-2018. - _MAX_UNDO_COMMANDS = 10000 - undoCommands = deque(maxlen=_MAX_UNDO_COMMANDS) - - def deleteItem(self): - return self._prim.SetActive(False) - - def deleteItemCmd(self): - # FIXME Python binding lifescope. Must keep command object alive. - deleteCmd = UsdUndoDeleteCommand(self._prim) - deleteCmd.execute() - UsdSceneItemOps.undoCommands.append(deleteCmd) - return deleteCmd - - def duplicateItem(self): - (usdDstPath, layer) = UsdUndoDuplicateCommand.primInfo(self._prim) - status = UsdUndoDuplicateCommand.duplicate( - layer, self._prim.GetPath(), usdDstPath) - # The duplicate is a sibling of the source. - return createSiblingSceneItem( - self.path(), usdDstPath.elementString) if status else None - - def duplicateItemCmd(self): - # FIXME Python binding lifescope. Must keep command object alive. - duplicateCmd = UsdUndoDuplicateCommand(self._prim, self._path) - duplicateCmd.execute() - UsdSceneItemOps.undoCommands.append(duplicateCmd) - return ufe.Duplicate(createSiblingSceneItem( - self.path(), duplicateCmd.usdDstPath().elementString), duplicateCmd) - - def renameItem(self, newName): - UsdUndoRenameCommand(self._item, newName).execute() - - def renameItemCmd(self, newName): - # FIXME Python binding lifescope. Must keep command object alive. - renameCmd = UsdUndoRenameCommand(self._item, newName) - renameCmd.execute() - UsdSceneItemOps.undoCommands.append(renameCmd) - return ufe.Rename(renameCmd.renamedItem(), renameCmd) - -class UsdSceneItemOpsHandler(ufe.SceneItemOpsHandler): - def __init__(self): - super(UsdSceneItemOpsHandler, self).__init__() - self._usdSceneItemOps = UsdSceneItemOps() - - def sceneItemOps(self, item): - self._usdSceneItemOps.setItem(item) - return self._usdSceneItemOps - -def initialize(): - # Replace the Maya hierarchy handler with ours. - global mayaHierarchyHandler - global mayaRtid - global USDRtid - mayaRtid = ufe.RunTimeMgr.instance().getId(kMayaRunTimeName) - mayaHierarchyHandler = ufe.RunTimeMgr.instance().hierarchyHandler(mayaRtid) - ufe.RunTimeMgr.instance().setHierarchyHandler( - mayaRtid, ProxyShapeHierarchyHandler(mayaHierarchyHandler)) - - USDRtid = ufe.RunTimeMgr.instance().register( - kUSDRunTimeName, UsdHierarchyHandler(), - UsdTransform3dHandler(), UsdSceneItemOpsHandler()) - - # Set up to support either the Pixar proxy shape or the AL proxy shape. In - # order: - # 1) If AL plugin is loaded, use AL proxy shape. - # 2) If Pixar plugin is loaded, use Pixar proxy shape. - # 3) Default: use AL proxy shape. - global proxyShapeHandler - if cmds.pluginInfo("AL_USDMayaPlugin", query=True, loaded=True): - proxyShapeHandler = ALProxyShapeHandler() - elif cmds.pluginInfo("pxrUsd", query=True, loaded=True): - proxyShapeHandler = PxrProxyShapeHandler() - else: - proxyShapeHandler = ALProxyShapeHandler() - -def finalize(): - # Restore the normal Maya hierarchy handler, and unregister. - global mayaHierarchyHandler - ufe.RunTimeMgr.instance().setHierarchyHandler(mayaRtid, mayaHierarchyHandler) - ufe.RunTimeMgr.instance().unregister(USDRtid) - mayaHierarchyHandler = None - - global proxyShapeHandler - proxyShapeHandler = None diff --git a/plugins/ADSK_USDMaya/python/ufeScripts/usdSubject.py b/plugins/ADSK_USDMaya/python/ufeScripts/usdSubject.py deleted file mode 100644 index ec4c3768e6..0000000000 --- a/plugins/ADSK_USDMaya/python/ufeScripts/usdSubject.py +++ /dev/null @@ -1,224 +0,0 @@ -#!/usr/bin/env python - -#- -# =========================================================================== -# Copyright 2018 Autodesk, Inc. All rights reserved. -# -# Use of this software is subject to the terms of the Autodesk license -# agreement provided at the time of installation or download, or which -# otherwise accompanies this software in either electronic or hard copy form. -# =========================================================================== -#+ - -#- -# =========================================================================== -# WARNING: PROTOTYPE CODE -# -# The code in this file is intended as an engineering prototype, to demonstrate -# UFE integration in Maya. Its performance and stability may make it -# unsuitable for production use. -# -# Autodesk believes production quality would be better achieved with a C++ -# version of this code. -# -# =========================================================================== -#+ - -'''Universal Front End USD Observer pattern experiment. - -This experimental module is to investigate providing UFE Observer support -for USD, that is, to translate USD notifications into a UFE equivalent.''' - -import maya.api.OpenMaya as OpenMaya -import maya.cmds as cmds -# For nameToDagPath(). -import maya.app.renderSetup.common.utils as utils - -from pxr import Tf -from pxr import Usd - -import ufe -import usdRunTime - -# Subject singleton for observation of all USD stages. -_stagesSubject = None - -def dagPathToUfe(dagPath): - # This function can only create UFE Maya scene items with a single segment, - # as it is only given a Dag path as input. - return ufe.Path(dagPathToPathSegment(dagPath)); - -def dagPathToPathSegment(dagPath): - # Unfortunately, there does not seem to be a Maya API equivalent to - # TdagPathIterator. There must be a better way. PPT, 3-Oct-2018. - nbComponents = dagPath.length() - components = [] - for i in xrange(nbComponents): - obj = dagPath.node() - fn = OpenMaya.MFnDependencyNode(obj) - components.insert(0, ufe.PathComponent(fn.name())) - dagPath.pop() - # Prepend world at the start of the segment. - components.insert(0, ufe.PathComponent('world')) - return ufe.PathSegment(components, 1, '|'); - -# Map of stage to corresponding AL_usdmaya_ProxyShape UFE path. Ideally, we -# would support dynamically computing the path for the AL_usdmaya_ProxyShape -# node, but we assume here it will not be reparented. We will also assume that -# a USD stage will not be instanced (even though nothing in the data model -# prevents it). -_stageToPath = {} - -def stagePath(stage): - '''Return the AL_usdmaya_ProxyShape node UFE path for the argument stage.''' - # Use get() to return None rather than raise KeyError. - return _stageToPath.get(stage) - -def isTransform3D(usdChangedPath): - '''Return whether a USD changed path notification denotes a UFE - Transform3d change.''' - # Very rough initial implementation. For now, compare USD path element - # string value. - return usdChangedPath.elementString == '.xformOp:translate' - -class _StagesSubject(object): - '''Subject class to observe Maya scene. - - This class observes Maya file open, to register a USD observer on each - stage the Maya scene contains. This USD observer translates USD - notifications into UFE notifications. - ''' - - def __init__(self): - super(_StagesSubject, self).__init__() - - # Map of per-stage listeners, indexed by stage. - self._stageListeners = {} - - # Workaround to MAYA-65920: at startup, MSceneMessage.kAfterNew file - # callback is incorrectly called by Maya before the - # MSceneMessage.kBeforeNew file callback, which should be illegal. - # Detect this and ignore illegal calls to after new file callbacks. - # PPT, 19-Jan-16. - self._beforeNewCbCalled = False - - self._cbIds = [] - cbArgs = [(OpenMaya.MSceneMessage.kBeforeNew, self._beforeNewCb, - 'before new'), - (OpenMaya.MSceneMessage.kBeforeOpen, self._beforeOpenCb, - 'before open'), - (OpenMaya.MSceneMessage.kAfterOpen, self._afterOpenCb, - 'after open'), - (OpenMaya.MSceneMessage.kAfterNew, self._afterNewCb, - 'after new')] - - for (msg, cb, data) in cbArgs: - self._cbIds.append( - OpenMaya.MSceneMessage.addCallback(msg, cb, data)) - - def finalize(self): - OpenMaya.MMessage.removeCallbacks(self._cbIds) - self._cbIds = [] - - def _beforeNewCb(self, data): - self._beforeNewCbCalled = True - - def _beforeOpenCb(self, data): - self._beforeNewCb(data) - - def _afterNewCb(self, data): - # Workaround to MAYA-65920: detect and avoid illegal callback sequence. - if not self._beforeNewCbCalled: - return - - self._beforeNewCbCalled = False - - self._afterOpenCb(data) - - def _afterOpenCb(self, data): - # Observe stage changes, for all stages. Return listener object can - # optionally be used to call Revoke() to remove observation, but must - # keep reference to it, otherwise its reference count is immediately - # decremented, falls to zero, and no observation occurs. - - # Ideally, we would observe the data model only if there are observers, - # to minimize cost of observation. However, since observation is - # frequent, we won't implement this for now. PPT, 22-Dec-2017. - for listener in self._stageListeners.itervalues(): - listener.Revoke() - - for stage in getStages(): - self._stageListeners[stage] = Tf.Notice.Register( - Usd.Notice.ObjectsChanged, self.stageChanged, stage) - - # Set up our stage to AL_usdmaya_ProxyShape UFE path (and reverse) - # mapping. We do this with the following steps: - # - get all proxyShape nodes in the scene. - # - get their AL Python wrapper - # - get their Dag paths - # - convert the Dag paths to UFE paths. - _stageToPath.clear() - proxyShapeNames = usdRunTime.proxyShapeHandler.getAllNames() - dagPaths = [utils.nameToDagPath(psn) for psn in proxyShapeNames] - ufePaths = [dagPathToUfe(dagPath) for dagPath in dagPaths] - - for psn, ufePath in zip(proxyShapeNames, ufePaths): - stage = usdRunTime.proxyShapeHandler.nameToStage(psn) - _stageToPath[stage] = ufePath - usdRunTime.pathToStage[ufePath] = stage - - def stageChanged(self, notice, sender): - '''Call the stageChanged() methods on stage observers. - - Notice will be of type Usd.Notice.ObjectsChanged. Sender is stage.''' - - # If the stage path has not been initialized yet, do nothing - if not stagePath(sender): - return - - stage = notice.GetStage() - for changedPath in notice.GetResyncedPaths(): - usdPrimPathStr = str(changedPath.GetPrimPath()) - ufePath = stagePath(sender) + ufe.PathSegment( - usdPrimPathStr, 2, '/') - prim = stage.GetPrimAtPath(changedPath) - # Changed paths could be xformOps. - # These are considered as invalid null prims - if prim and not usdRunTime.inPathChange(): - if prim.IsActive(): - notification = ufe.ObjectAdd( - ufe.Hierarchy.createItem(ufePath)) - ufe.Scene.notifyObjectAdd(notification) - else: - notification = ufe.ObjectPostDelete( - ufe.Hierarchy.createItem(ufePath)) - ufe.Scene.notifyObjectDelete(notification) - - for changedPath in notice.GetChangedInfoOnlyPaths(): - usdPrimPathStr = str(changedPath.GetPrimPath()) - ufePath = stagePath(sender) + ufe.PathSegment( - usdPrimPathStr, 2, '/') - # We need to determine if the change is a Transform3d change. - # We must at least pick up xformOp:translate, xformOp:rotateXYZ, - # and xformOp:scale. - if changedPath.elementString.startswith('.xformOp:'): - ufe.Transform3d.notify(ufePath) - -def getStages(): - '''Get list of USD stages.''' - return usdRunTime.proxyShapeHandler.getAllStages() - -def initialize(): - # Only intended to be called by the plugin initialization, to - # initialize the stage model. - global _stagesSubject - - _stagesSubject = _StagesSubject() - -def finalize(): - # Only intended to be called by the plugin finalization, to - # finalize the stage model. - global _stagesSubject - - _stagesSubject.finalize() - del _stagesSubject diff --git a/plugins/ADSK_USDMaya/python/ufeScripts/usdXformOpCmds.py b/plugins/ADSK_USDMaya/python/ufeScripts/usdXformOpCmds.py deleted file mode 100644 index 641727601b..0000000000 --- a/plugins/ADSK_USDMaya/python/ufeScripts/usdXformOpCmds.py +++ /dev/null @@ -1,325 +0,0 @@ -#!/usr/bin/env python - -#- -# =========================================================================== -# Copyright 2018 Autodesk, Inc. All rights reserved. -# -# Use of this software is subject to the terms of the Autodesk license -# agreement provided at the time of installation or download, or which -# otherwise accompanies this software in either electronic or hard copy form. -# =========================================================================== -#+ - -#- -# =========================================================================== -# WARNING: PROTOTYPE CODE -# -# The code in this file is intended as an engineering prototype, to demonstrate -# UFE integration in Maya. Its performance and stability may make it -# unsuitable for production use. -# -# Autodesk believes production quality would be better achieved with a C++ -# version of this code. -# -# =========================================================================== -#+ - -'''Universal Front End USD transform operations - -This module provides the logic to operate xform operations on USD objects -''' - -import ufe - -import maya.api.OpenMaya as OpenMaya - -from pxr import UsdGeom -from pxr import Gf -from math import degrees, radians - -# =========================================================================== -# Utils -# =========================================================================== -def tuples2dToList(tuples2D): - listTuples = [] - for i, tuple in enumerate(tuples2D): - listTuples.insert(i, list(tuple)) - return listTuples - -def primToUfeXform(prim): - xformCache = UsdGeom.XformCache() - usdMatrix = xformCache.GetLocalToWorldTransform(prim) - xform = ufe.Matrix4d() - xform.matrix = tuples2dToList(usdMatrix) - return xform - -def primToUfeExclusiveXform(prim): - xformCache = UsdGeom.XformCache() - usdMatrix = xformCache.GetParentToWorldTransform(prim) - xform = ufe.Matrix4d() - xform.matrix = tuples2dToList(usdMatrix) - return xform - -def convertToCompatibleCommonAPI(prim): - """ - As we are using USD's XformCommonAPI which supports only the following xformOps : - ["xformOp:translate", "xformOp:translate:pivot", "xformOp:rotateXYZ", "xformOp:scale", "!invert!xformOp:translate:pivot"] - We are extending the supported xform Operations with : - ["xformOp:rotateX", "xformOp:rotateY", "xformOp:rotateZ"] - Where we convert these into xformOp:rotateXYZ. - """ - xformable = UsdGeom.Xformable(prim) - xformOps = xformable.GetOrderedXformOps() - xformable.ClearXformOpOrder() - primXform = UsdGeom.XformCommonAPI(prim) - for op in xformOps: - # RotateX - if op.GetOpName() == "xformOp:rotateX": - primXform.SetRotate(Gf.Vec3f(op.Get(),0,0)) - # RotateY - elif op.GetOpName() == "xformOp:rotateY": - primXform.SetRotate(Gf.Vec3f(0, op.Get(),0)) - # RotateZ - elif op.GetOpName() == "xformOp:rotateZ": - primXform.SetRotate(Gf.Vec3f(0, 0, op.Get())) - # RotateXYZ - elif op.GetOpName() == "xformOp:rotateXYZ": - primXform.SetRotate(op.Get()) - # Scale - elif op.GetOpName() == "xformOp:scale": - primXform.SetScale(op.Get()) - # Translate - elif op.GetOpName() == "xformOp:translate": - primXform.SetTranslate(op.Get()) - # Scale / rotate pivot - elif op.GetOpName() == "xformOp:translate:pivot": - primXform.SetPivot(op.Get()) - # Scale / rotate pivot inverse: automatically added, nothing to do. - elif op.GetOpName() == "!invert!xformOp:translate:pivot": - pass - # Not compatible - else: - # Restore old - xformable.SetXformOpOrder(xformOps) - raise Exception("Incompatible xform op %s:" % op.GetOpName()) - return primXform - -# =========================================================================== -# Translate Operations -# =========================================================================== -def translateOp(prim, path, x, y, z,): - ''' Absolute translation of the given prim ''' - primXform = UsdGeom.XformCommonAPI(prim) - if not primXform.SetTranslate(Gf.Vec3d(x,y,z)): - # This could mean that we have an incompatible xformOp in the stack - try: - primXform = convertToCompatibleCommonAPI(prim) - if not primXform.SetTranslate(Gf.Vec3d(x,y,z)): - raise Exception ("Unable to SetTranslate on the 2nd try.") - except Exception as e: - raise Exception("Failed to translate prim %s - %s" % (str(path), e)) - -class UsdTranslateUndoableCommand(ufe.TranslateUndoableCommand): - ''' - Translation command of the given prim - Ability to perform undo to restore the original translate value. - As of 06/07/2018, redo is a no op as Maya re-does the operation for redo - ''' - def __init__(self, prim, ufePath, item): - super(UsdTranslateUndoableCommand, self).__init__(item) - self._prim = prim - self._noTranslateOp = False - self._path = ufePath - - # Prim does not have a translate attribute - if not self._prim.HasAttribute('xformOp:translate'): - self._noTranslateOp = True - translateOp(self._prim, self._path, 0,0,0)# Add an empty translate - - self._xlateAttrib = self._prim.GetAttribute('xformOp:translate') - self._prevXlate = self._prim.GetAttribute('xformOp:translate').Get() - - def _perform(self): - ''' No-op, Use translate to move the object ''' - pass - - def undo(self): - self._xlateAttrib.Set(self._prevXlate) - # Todo : We would want to remove the xformOp - # (SD-06/07/2018) Haven't found a clean way to do it - would need to investigate - - def redo(self): - self._perform() - - def translate(self, x, y, z): - translateOp(self._prim, self._path, x,y,z) - return True - -#=========================================================================== -# Rotate Operations -#=========================================================================== -def rotateOp(prim, path, x, y, z): - ''' Absolute rotation (degrees) of the given prim ''' - primXform = UsdGeom.XformCommonAPI(prim) - if not primXform.SetRotate(Gf.Vec3f(x,y,z)): - # This could mean that we have an incompatible xformOp in the stack - try: - primXform = convertToCompatibleCommonAPI(prim) - if not primXform.SetRotate(Gf.Vec3f(x,y,z)): - raise Exception ("Unable to SetRotate on the 2nd try.") - except Exception as e: - raise Exception("Failed to rotate prim %s - %s" % (str(path), e)) - -class UsdRotateUndoableCommand(ufe.RotateUndoableCommand): - ''' - Absolute rotation command of the given prim - Ability to perform undo to restore the original rotation value. - As of 06/07/2018, redo is a no op as Maya re-does the operation for redo - ''' - def __init__(self, prim, ufePath, item): - super(UsdRotateUndoableCommand, self).__init__(item) - self._prim = prim - self._noRotateOp = False - self._path = ufePath - self._failedInit = None - - # Since we want to change xformOp:rotateXYZ, and we need to store the prevRotate for - # undo purpose, we need to make sure we convert it to common API xformOps (In case we have - # rotateX, rotateY or rotateZ ops) - try: - convertToCompatibleCommonAPI(prim) - except Exception as e: - # Since Maya cannot catch this error at this moment, store it until we actually rotate - self._failedInit = e - return - - # Prim does not have a rotateXYZ attribute - if not self._prim.HasAttribute('xformOp:rotateXYZ'): - rotateOp(self._prim, self._path, 0,0,0) - self._noRotateOp = True - - self._rotAttrib = self._prim.GetAttribute('xformOp:rotateXYZ') - self._prevRotate = self._prim.GetAttribute('xformOp:rotateXYZ').Get() - - def _perform(self): - ''' No-op, Use rotate to move the object ''' - pass - - def undo(self): - # Check if initialization went ok. - if not self._failedInit: - self._rotAttrib.Set(self._prevRotate) - # Todo : We would want to remove the xformOp - # (SD-06/07/2018) Haven't found a clean way to do it - would need to investigate - - def redo(self): - self._perform() - - def rotate(self, x, y, z): - # Fail early - Initialization did not go as expected - if self._failedInit: - raise self._failedInit - rotateOp(self._prim, self._path,x,y,z) - return True - -# =========================================================================== -# Scale Operations -# =========================================================================== -def scaleOp(prim, path, x, y, z,): - ''' Absolute scale of the given prim ''' - primXform = UsdGeom.XformCommonAPI(prim) - if not primXform.SetScale(Gf.Vec3f(x,y,z)): - # This could mean that we have an incompatible xformOp in the stack - try: - primXform = convertToCompatibleCommonAPI(prim) - if not primXform.SetScale(Gf.Vec3f(x,y,z)): - raise Exception ("Unable to SetScale on the 2nd try.") - except Exception as e: - raise Exception("Failed to scale prim %s - %s" % (str(path), e)) - -class UsdScaleUndoableCommand(ufe.ScaleUndoableCommand): - ''' - Absolute scale command of the given prim - Ability to perform undo to restore the original scale value. - As of 06/07/2018, redo is a no op as Maya re-does the operation for redo - ''' - def __init__(self, prim, ufePath, item): - super(UsdScaleUndoableCommand, self).__init__(item) - self._prim = prim - self._noScaleOp = False - self._path = ufePath - - # Prim does not have a scale attribute - if not self._prim.HasAttribute('xformOp:scale'): - self._noScaleOp = True - scaleOp(self._prim, self._path, 1,1,1)# Add a neutral scale xformOp - - self._scaleAttrib = self._prim.GetAttribute('xformOp:scale') - self._prevScale = self._prim.GetAttribute('xformOp:scale').Get() - - def _perform(self): - ''' No-op, Use scale to scale the object ''' - pass - - def undo(self): - self._scaleAttrib.Set(self._prevScale) - # Todo : We would want to remove the xformOp - # (SD-06/07/2018) Haven't found a clean way to do it - would need to investigate - - def redo(self): - self._perform() - - def scale(self, x, y, z): - scaleOp(self._prim, self._path, x,y,z) - return True - -# =========================================================================== -# Pivot Operations -# =========================================================================== -def rotatePivotTranslateOp(prim, path, x, y, z,): - ''' Absolute translation of the given prim's pivot point.''' - primXform = UsdGeom.XformCommonAPI(prim) - if not primXform.SetPivot(Gf.Vec3f(x,y,z)): - # This could mean that we have an incompatible xformOp in the stack - try: - primXform = convertToCompatibleCommonAPI(prim) - if not primXform.SetPivot(Gf.Vec3f(x,y,z)): - raise Exception ("Unable to SetPivot on the 2nd try.") - except Exception as e: - raise Exception("Failed to set pivot for prim %s - %s" % (str(path), e)) - -class UsdRotatePivotTranslateUndoableCommand(ufe.TranslateUndoableCommand): - ''' - Absolute translation command of the given prim's rotate pivot. - Ability to perform undo to restore the original pivot value. - ''' - attrName = 'xformOp:translate:pivot' - - def __init__(self, prim, ufePath, item): - super(UsdRotatePivotTranslateUndoableCommand, self).__init__(item) - self._prim = prim - self._noPivotOp = False - self._path = ufePath - - # Prim does not have a pivot translate attribute - if not self._prim.HasAttribute(self.attrName): - self._noPivotOp = True - # Add an empty pivot translate. - rotatePivotTranslateOp(self._prim, self._path, 0,0,0) - - self._xlateAttrib = self._prim.GetAttribute(self.attrName) - self._prevXlate = self._xlateAttrib.Get() - - def undo(self): - self._xlateAttrib.Set(self._prevXlate) - # Todo : We would want to remove the xformOp - # (SD-06/07/2018) Haven't found a clean way to do it - would need to investigate - - def redo(self): - # As of 07-Jun-2018, redo is a no op as Maya re-does the operation for - # redo. - pass - - def translate(self, x, y, z): - rotatePivotTranslateOp(self._prim, self._path, x,y,z) - return True diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/px_vp20/api.h b/plugins/PXR_USDMaya/third_party/maya/lib/px_vp20/api.h deleted file mode 100644 index 4cd924c6a3..0000000000 --- a/plugins/PXR_USDMaya/third_party/maya/lib/px_vp20/api.h +++ /dev/null @@ -1,40 +0,0 @@ -// -// Copyright 2017 Pixar -// -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. -// -#ifndef PX_VP20_API_H -#define PX_VP20_API_H - -#include "pxr/base/arch/export.h" - -#if defined(PX_VP20_EXPORTS) -# define PX_VP20_API ARCH_EXPORT -# define PX_VP20_API_TEMPLATE_CLASS(...) ARCH_EXPORT_TEMPLATE(class, __VA_ARGS__) -# define PX_VP20_API_TEMPLATE_STRUCT(...) ARCH_EXPORT_TEMPLATE(struct, __VA_ARGS__) -#else -# define PX_VP20_API ARCH_IMPORT -# define PX_VP20_API_TEMPLATE_CLASS(...) ARCH_IMPORT_TEMPLATE(class, __VA_ARGS__) -# define PX_VP20_API_TEMPLATE_STRUCT(...) ARCH_IMPORT_TEMPLATE(struct, __VA_ARGS__) -#endif -#define PX_VP20_LOCAL ARCH_HIDDEN - -#endif diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/api.h b/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/api.h deleted file mode 100644 index cd635ef594..0000000000 --- a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/api.h +++ /dev/null @@ -1,40 +0,0 @@ -// -// Copyright 2017 Pixar -// -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. -// -#ifndef PXRUSDMAYAGL_API_H -#define PXRUSDMAYAGL_API_H - -#include "pxr/base/arch/export.h" - -#if defined(PXRUSDMAYAGL_EXPORTS) -# define PXRUSDMAYAGL_API ARCH_EXPORT -# define PXRUSDMAYAGL_API_TEMPLATE_CLASS(...) ARCH_EXPORT_TEMPLATE(class, __VA_ARGS__) -# define PXRUSDMAYAGL_API_TEMPLATE_STRUCT(...) ARCH_EXPORT_TEMPLATE(struct, __VA_ARGS__) -#else -# define PXRUSDMAYAGL_API ARCH_IMPORT -# define PXRUSDMAYAGL_API_TEMPLATE_CLASS(...) ARCH_IMPORT_TEMPLATE(class, __VA_ARGS__) -# define PXRUSDMAYAGL_API_TEMPLATE_STRUCT(...) ARCH_IMPORT_TEMPLATE(struct, __VA_ARGS__) -#endif -#define PXRUSDMAYAGL_LOCAL ARCH_HIDDEN - -#endif diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/debugCodes.h b/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/debugCodes.h deleted file mode 100644 index e94a6c9bc8..0000000000 --- a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/debugCodes.h +++ /dev/null @@ -1,48 +0,0 @@ -// -// Copyright 2018 Pixar -// -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. -// -#ifndef PXRUSDMAYAGL_DEBUG_CODES -#define PXRUSDMAYAGL_DEBUG_CODES - -/// \file pxrUsdMayaGL/debugCodes.h - -#include "pxr/pxr.h" -#include "pxr/base/tf/debug.h" - - -PXR_NAMESPACE_OPEN_SCOPE - - -TF_DEBUG_CODES( - PXRUSDMAYAGL_BATCHED_DRAWING, - PXRUSDMAYAGL_BATCHED_SELECTION, - PXRUSDMAYAGL_INSTANCER_TRACKING, - PXRUSDMAYAGL_SHAPE_ADAPTER_BUCKETING, - PXRUSDMAYAGL_SHAPE_ADAPTER_LIFECYCLE -); - - -PXR_NAMESPACE_CLOSE_SCOPE - - -#endif diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/userData.cpp b/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/userData.cpp deleted file mode 100644 index 6d2fb54e33..0000000000 --- a/plugins/PXR_USDMaya/third_party/maya/lib/pxrUsdMayaGL/userData.cpp +++ /dev/null @@ -1,53 +0,0 @@ -// -// Copyright 2018 Pixar -// -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. -// -#include "pxrUsdMayaGL/userData.h" - -#include "pxr/pxr.h" -#include "pxrUsdMayaGL/api.h" - -#include - - -PXR_NAMESPACE_OPEN_SCOPE - - -/// Note that we set deleteAfterUse=false when calling the MUserData -/// constructor. This ensures that the draw data survives across multiple draw -/// passes in Viewport 2.0 (e.g. a shadow pass and a color pass). -/// -/// drawShape is initialized to false, since we expect that the -/// pxrHdImagingShape will be the only one to set it to true. -PxrMayaHdUserData::PxrMayaHdUserData() : - MUserData(/* deleteAfterUse = */ false), - drawShape(false) -{ -} - -/* virtual */ -PxrMayaHdUserData::~PxrMayaHdUserData() -{ -} - - -PXR_NAMESPACE_CLOSE_SCOPE diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/api.h b/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/api.h deleted file mode 100644 index 305885f4ee..0000000000 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/api.h +++ /dev/null @@ -1,40 +0,0 @@ -// -// Copyright 2017 Pixar -// -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. -// -#ifndef PXRUSDMAYA_API_H -#define PXRUSDMAYA_API_H - -#include "pxr/base/arch/export.h" - -#if defined(USDMAYA_EXPORTS) -# define PXRUSDMAYA_API ARCH_EXPORT -# define PXRUSDMAYA_API_TEMPLATE_CLASS(...) ARCH_EXPORT_TEMPLATE(class, __VA_ARGS__) -# define PXRUSDMAYA_API_TEMPLATE_STRUCT(...) ARCH_EXPORT_TEMPLATE(struct, __VA_ARGS__) -#else -# define PXRUSDMAYA_API ARCH_IMPORT -# define PXRUSDMAYA_API_TEMPLATE_CLASS(...) ARCH_IMPORT_TEMPLATE(class, __VA_ARGS__) -# define PXRUSDMAYA_API_TEMPLATE_STRUCT(...) ARCH_IMPORT_TEMPLATE(struct, __VA_ARGS__) -#endif -#define PXRUSDMAYA_LOCAL ARCH_HIDDEN - -#endif diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/chaser.cpp b/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/chaser.cpp deleted file mode 100644 index 32fa8cce08..0000000000 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/chaser.cpp +++ /dev/null @@ -1,50 +0,0 @@ -// -// Copyright 2016 Pixar -// -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. -// -#include "usdMaya/chaser.h" - -PXR_NAMESPACE_OPEN_SCOPE - -bool -UsdMayaChaser::ExportDefault() -{ - // Do nothing by default. - return true; -} - -bool -UsdMayaChaser::ExportFrame(const UsdTimeCode& time) -{ - // Do nothing by default. - return true; -} - -bool -UsdMayaChaser::PostExport() -{ - // Do nothing by default. - return true; -} - -PXR_NAMESPACE_CLOSE_SCOPE - diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/colorSpace.cpp b/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/colorSpace.cpp deleted file mode 100644 index 815e7b350b..0000000000 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/colorSpace.cpp +++ /dev/null @@ -1,41 +0,0 @@ -// -// Copyright 2018 Pixar -// -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. -// -#include "usdMaya/colorSpace.h" - -#include "pxr/base/tf/envSetting.h" - -PXR_NAMESPACE_USING_DIRECTIVE - -TF_DEFINE_ENV_SETTING(PIXMAYA_LINEAR_COLORS, false, - "If colors from maya should be treated as linear. " - "When false, colors are assumed to be gamma-corrected."); - -bool -UsdMayaColorSpace::IsColorManaged() -{ - // in theory this could vary per scene, but we think mixing that within any - // given pipeline is likely confusing. Also, we want to avoid this function - // calling out to mel. - return TfGetEnvSetting(PIXMAYA_LINEAR_COLORS); -} diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/debugCodes.cpp b/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/debugCodes.cpp deleted file mode 100644 index b0ac8f32e7..0000000000 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/debugCodes.cpp +++ /dev/null @@ -1,40 +0,0 @@ -// -// Copyright 2016 Pixar -// -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. -// -#include "usdMaya/debugCodes.h" - -#include "pxr/base/tf/registryManager.h" - -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."); -} - -PXR_NAMESPACE_CLOSE_SCOPE - diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/debugCodes.h b/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/debugCodes.h deleted file mode 100644 index 491c912efe..0000000000 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/debugCodes.h +++ /dev/null @@ -1,41 +0,0 @@ -// -// Copyright 2016 Pixar -// -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. -// -#ifndef PXRUSDMAYA_DEBUGCODES_H -#define PXRUSDMAYA_DEBUGCODES_H - -#include "pxr/pxr.h" -#include "pxr/base/tf/debug.h" - -PXR_NAMESPACE_OPEN_SCOPE - - -TF_DEBUG_CODES( - PXRUSDMAYA_REGISTRY, - PXRUSDMAYA_DIAGNOSTICS -); - - -PXR_NAMESPACE_CLOSE_SCOPE - -#endif diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/exportCommand.h b/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/exportCommand.h deleted file mode 100644 index 6a8956c9e1..0000000000 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/exportCommand.h +++ /dev/null @@ -1,59 +0,0 @@ -// -// Copyright 2016 Pixar -// -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. -// -#ifndef PXRUSDMAYA_EXPORT_COMMAND_H -#define PXRUSDMAYA_EXPORT_COMMAND_H - -/// \file usdMaya/exportCommand.h - -#include "usdMaya/api.h" - -#include "pxr/pxr.h" - -#include - -PXR_NAMESPACE_OPEN_SCOPE - - -class UsdMayaExportCommand : public MPxCommand -{ - public: - PXRUSDMAYA_API - UsdMayaExportCommand(); - PXRUSDMAYA_API - ~UsdMayaExportCommand() override; - - PXRUSDMAYA_API - MStatus doIt(const MArgList& args) override; - bool isUndoable () const override { return false; }; - - PXRUSDMAYA_API - static MSyntax createSyntax(); - PXRUSDMAYA_API - static void* creator(); -}; - - -PXR_NAMESPACE_CLOSE_SCOPE - -#endif diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/fallbackPrimReader.h b/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/fallbackPrimReader.h deleted file mode 100644 index 1092982126..0000000000 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/fallbackPrimReader.h +++ /dev/null @@ -1,47 +0,0 @@ -// -// Copyright 2018 Pixar -// -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. -// -#ifndef PXRUSDMAYA_FALLBACK_PRIM_READER_H -#define PXRUSDMAYA_FALLBACK_PRIM_READER_H - -/// \file usdMaya/fallbackPrimReader.h - -#include "usdMaya/primReader.h" -#include "usdMaya/primReaderRegistry.h" - -PXR_NAMESPACE_OPEN_SCOPE - -/// This is a special prim reader that is used whenever a typeless prim or prim -/// with unknown types is encountered when traversing USD. -class UsdMaya_FallbackPrimReader : public UsdMayaPrimReader { -public: - UsdMaya_FallbackPrimReader(const UsdMayaPrimReaderArgs& args); - - virtual bool Read(UsdMayaPrimReaderContext* context); - - static UsdMayaPrimReaderRegistry::ReaderFactoryFn CreateFactory(); -}; - -PXR_NAMESPACE_CLOSE_SCOPE - -#endif diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/listShadingModesCommand.h b/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/listShadingModesCommand.h deleted file mode 100644 index 7c520cca00..0000000000 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/listShadingModesCommand.h +++ /dev/null @@ -1,57 +0,0 @@ -// -// Copyright 2016 Pixar -// -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. -// -#ifndef PXRUSDMAYA_LIST_SHADING_MODES_COMMAND_H -#define PXRUSDMAYA_LIST_SHADING_MODES_COMMAND_H - -/// \file usdMaya/listShadingModesCommand.h - -#include "usdMaya/api.h" - -#include "pxr/pxr.h" - -#include - -PXR_NAMESPACE_OPEN_SCOPE - -class UsdMayaListShadingModesCommand : public MPxCommand -{ -public: - PXRUSDMAYA_API - UsdMayaListShadingModesCommand(); - PXRUSDMAYA_API - ~UsdMayaListShadingModesCommand() override; - - PXRUSDMAYA_API - MStatus doIt(const MArgList& args) override; - bool isUndoable () const override { return false; }; - - PXRUSDMAYA_API - static MSyntax createSyntax(); - PXRUSDMAYA_API - static void* creator(); -}; - -PXR_NAMESPACE_CLOSE_SCOPE - -#endif diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/module.cpp b/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/module.cpp deleted file mode 100644 index b3371c7761..0000000000 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/module.cpp +++ /dev/null @@ -1,44 +0,0 @@ -// -// Copyright 2016 Pixar -// -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. -// -#include "pxr/pxr.h" -#include "pxr/base/tf/pyModule.h" - -PXR_NAMESPACE_USING_DIRECTIVE - -TF_WRAP_MODULE { - TF_WRAP(Adaptor); - TF_WRAP(Assembly); - TF_WRAP(BlockSceneModificationContext); - TF_WRAP(ColorSpace); - TF_WRAP(DiagnosticDelegate); - TF_WRAP(EditUtil); - TF_WRAP(MeshUtil); - TF_WRAP(Query); - TF_WRAP(ReadUtil); - TF_WRAP(RoundTripUtil); - TF_WRAP(StageCache); - TF_WRAP(UserTaggedAttribute); - TF_WRAP(WriteUtil); - TF_WRAP(XformStack); -} diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/primReader.cpp b/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/primReader.cpp deleted file mode 100644 index 3f6c8fb5b9..0000000000 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/primReader.cpp +++ /dev/null @@ -1,49 +0,0 @@ -// -// Copyright 2018 Pixar -// -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. -// -#include "usdMaya/primReader.h" - -PXR_NAMESPACE_OPEN_SCOPE - -UsdMayaPrimReader::UsdMayaPrimReader(const UsdMayaPrimReaderArgs& args) - : _args(args) -{ -} - -bool -UsdMayaPrimReader::HasPostReadSubtree() const -{ - return false; -} - -void -UsdMayaPrimReader::PostReadSubtree(UsdMayaPrimReaderContext*) -{ -} - -const UsdMayaPrimReaderArgs& -UsdMayaPrimReader::_GetArgs() { - return _args; -} - -PXR_NAMESPACE_CLOSE_SCOPE diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/query.h b/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/query.h deleted file mode 100644 index 92d2c2fdd6..0000000000 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/query.h +++ /dev/null @@ -1,55 +0,0 @@ -// -// Copyright 2016 Pixar -// -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. -// -#ifndef PXRUSDMAYA_QUERY_H -#define PXRUSDMAYA_QUERY_H - -/// \file usdMaya/query.h - -#include "usdMaya/api.h" - -#include "pxr/pxr.h" - -#include "pxr/usd/usd/stage.h" -#include "pxr/usd/usd/prim.h" - -#include -#include - -PXR_NAMESPACE_OPEN_SCOPE - - -struct UsdMayaQuery -{ - /*! \brief converts a dagPath of a usdStageShapeNode into a usdprim - */ - PXRUSDMAYA_API - static UsdPrim GetPrim(const std::string& shapeName); - PXRUSDMAYA_API - static void ReloadStage(const std::string& shapeName); -}; - - -PXR_NAMESPACE_CLOSE_SCOPE - -#endif diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdMayaAppDir.py b/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdMayaAppDir.py deleted file mode 100644 index c792a9d56f..0000000000 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/testenv/testUsdMayaAppDir.py +++ /dev/null @@ -1,46 +0,0 @@ -#!/pxrpythonsubst -# -# Copyright 2018 Pixar -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# - -import unittest, os - -from maya import standalone - - -class testUsdMayaAppDir(unittest.TestCase): - - @classmethod - def setUpClass(cls): - standalone.initialize('usd') - - @classmethod - def tearDownClass(cls): - standalone.uninitialize() - - def testCheckEnvVar(self): - self.assertEqual(os.environ.get('DUMMY_TEST_VAR'), 'exists') - - -if __name__ == '__main__': - unittest.main(verbosity=2) diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorCurves.h b/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorCurves.h deleted file mode 100644 index 294720da6a..0000000000 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorCurves.h +++ /dev/null @@ -1,56 +0,0 @@ -// -// Copyright 2016 Pixar -// -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. -// -#ifndef PXRUSDMAYA_TRANSLATOR_CURVES_H -#define PXRUSDMAYA_TRANSLATOR_CURVES_H - -/// \file usdMaya/translatorCurves.h - -#include "usdMaya/api.h" -#include "usdMaya/primReaderArgs.h" -#include "usdMaya/primReaderContext.h" - -#include "pxr/pxr.h" - -#include "pxr/usd/usdGeom/curves.h" - -#include - -PXR_NAMESPACE_OPEN_SCOPE - - -/// \brief Provides helper functions for creating UsdCurves -struct UsdMayaTranslatorCurves -{ - /// \brief Creates a NurbsCurve under \p parentNode. - PXRUSDMAYA_API - static bool Create( - const UsdGeomCurves& curves, - MObject parentNode, - const UsdMayaPrimReaderArgs& args, - UsdMayaPrimReaderContext* context); -}; - -PXR_NAMESPACE_CLOSE_SCOPE - -#endif diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorNurbsPatch.h b/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorNurbsPatch.h deleted file mode 100644 index a8d251cda6..0000000000 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorNurbsPatch.h +++ /dev/null @@ -1,57 +0,0 @@ -// -// Copyright 2016 Pixar -// -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. -// -#ifndef PXRUSDMAYA_TRANSLATOR_NURBSPATCH_H -#define PXRUSDMAYA_TRANSLATOR_NURBSPATCH_H - -/// \file usdMaya/translatorNurbsPatch.h - -#include "usdMaya/api.h" -#include "usdMaya/primReaderArgs.h" -#include "usdMaya/primReaderContext.h" - -#include "pxr/pxr.h" - -#include "pxr/usd/usdGeom/nurbsPatch.h" - -#include - -PXR_NAMESPACE_OPEN_SCOPE - - - -struct UsdMayaTranslatorNurbsPatch -{ - PXRUSDMAYA_API - static bool Read( - const UsdGeomNurbsPatch& usdNurbsPatch, - MObject parentNode, - const UsdMayaPrimReaderArgs& args, - UsdMayaPrimReaderContext* context); -}; - - - -PXR_NAMESPACE_CLOSE_SCOPE - -#endif diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorPrim.h b/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorPrim.h deleted file mode 100644 index 990347e2e7..0000000000 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/translatorPrim.h +++ /dev/null @@ -1,57 +0,0 @@ -// -// Copyright 2016 Pixar -// -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. -// -#ifndef PXRUSDMAYA_TRANSLATOR_PRIM_H -#define PXRUSDMAYA_TRANSLATOR_PRIM_H - -/// \file usdMaya/translatorPrim.h - -#include "usdMaya/api.h" -#include "usdMaya/primReaderArgs.h" -#include "usdMaya/primReaderContext.h" - -#include "pxr/pxr.h" - -#include "pxr/usd/usd/prim.h" - -#include - -PXR_NAMESPACE_OPEN_SCOPE - - -/// \brief Provides helper functions for reading UsdPrim. This should more -/// accurately take a UsdGeomImageable. -struct UsdMayaTranslatorPrim -{ - PXRUSDMAYA_API - static void Read( - const UsdPrim& prim, - MObject mayaNode, - const UsdMayaPrimReaderArgs& args, - UsdMayaPrimReaderContext* context); -}; - - -PXR_NAMESPACE_CLOSE_SCOPE - -#endif diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/usdPrimProvider.cpp b/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/usdPrimProvider.cpp deleted file mode 100644 index 8782ed367d..0000000000 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/usdPrimProvider.cpp +++ /dev/null @@ -1,35 +0,0 @@ -// -// Copyright 2016 Pixar -// -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. -// -#include "pxr/pxr.h" -#include "usdMaya/usdPrimProvider.h" - -PXR_NAMESPACE_OPEN_SCOPE - - -UsdMayaUsdPrimProvider::~UsdMayaUsdPrimProvider() -{ -} - -PXR_NAMESPACE_CLOSE_SCOPE - diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/usdPrimProvider.h b/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/usdPrimProvider.h deleted file mode 100644 index e5b063b9da..0000000000 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/usdPrimProvider.h +++ /dev/null @@ -1,48 +0,0 @@ -// -// Copyright 2016 Pixar -// -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. -// -#ifndef PXRUSDMAYA_USD_PRIM_PROVIDER_H -#define PXRUSDMAYA_USD_PRIM_PROVIDER_H - -#include "pxr/pxr.h" -#include "usdMaya/api.h" -#include "pxr/usd/usd/prim.h" - -PXR_NAMESPACE_OPEN_SCOPE - - -// interface class -class UsdMayaUsdPrimProvider -{ -public: - // returns the prim that this node is holding - virtual UsdPrim usdPrim() const = 0; - - PXRUSDMAYA_API - virtual ~UsdMayaUsdPrimProvider(); -}; - - -PXR_NAMESPACE_CLOSE_SCOPE - -#endif diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/wrapQuery.cpp b/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/wrapQuery.cpp deleted file mode 100644 index d73bcba34e..0000000000 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/wrapQuery.cpp +++ /dev/null @@ -1,42 +0,0 @@ -// -// Copyright 2016 Pixar -// -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. -// -#include "pxr/pxr.h" -#include "usdMaya/query.h" - -#include -#include - -#include "pxr/base/tf/pyResultConversions.h" - -using namespace std; -using namespace boost::python; -using namespace boost; - -PXR_NAMESPACE_USING_DIRECTIVE - -void wrapQuery() -{ - def("GetPrim", UsdMayaQuery::GetPrim); - def("ReloadStage", UsdMayaQuery::ReloadStage); -} diff --git a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/wrapStageCache.cpp b/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/wrapStageCache.cpp deleted file mode 100644 index 4c1b949a0d..0000000000 --- a/plugins/PXR_USDMaya/third_party/maya/lib/usdMaya/wrapStageCache.cpp +++ /dev/null @@ -1,50 +0,0 @@ -// -// Copyright 2016 Pixar -// -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. -// -#include "pxr/pxr.h" -#include "usdMaya/stageCache.h" - -#include -#include -#include - -#include "pxr/base/tf/pyResultConversions.h" - -using namespace std; -using namespace boost::python; -using namespace boost; - -PXR_NAMESPACE_USING_DIRECTIVE - -void wrapStageCache() -{ - class_("StageCache") - - .def("Get", &UsdMayaStageCache::Get, - (args("forcePopulate") = true), - return_value_policy()) - .staticmethod("Get") - .def("Clear", &UsdMayaStageCache::Clear) - .staticmethod("Clear") - ; -} diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsd/usdTranslator.cpp b/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsd/usdTranslator.cpp deleted file mode 100644 index 2a804933e4..0000000000 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsd/usdTranslator.cpp +++ /dev/null @@ -1,42 +0,0 @@ -// -// Copyright 2016 Pixar -// -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. -// -#include "usdMaya/translatorModelAssembly.h" -#include "usdMaya/primWriterRegistry.h" - -#include "pxr/pxr.h" - -PXR_NAMESPACE_OPEN_SCOPE - -PXRUSDMAYA_DEFINE_WRITER(pxrUsdReferenceAssembly, args, context) -{ - return UsdMayaTranslatorModelAssembly::Create(args, context); -} - - -PXRUSDMAYA_DEFINE_WRITER(pxrUsdProxyShape, args, context) -{ - return UsdMayaTranslatorModelAssembly::Create(args, context); -} - -PXR_NAMESPACE_CLOSE_SCOPE diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/cameraReader.cpp b/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/cameraReader.cpp deleted file mode 100644 index 73fafa098e..0000000000 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/cameraReader.cpp +++ /dev/null @@ -1,49 +0,0 @@ -// -// Copyright 2016 Pixar -// -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. -// -#include "pxr/pxr.h" -#include "usdMaya/primReaderRegistry.h" -#include "usdMaya/translatorCamera.h" - -#include "pxr/usd/usd/prim.h" -#include "pxr/usd/usdGeom/camera.h" - -#include - -PXR_NAMESPACE_OPEN_SCOPE - - - -PXRUSDMAYA_DEFINE_READER(UsdGeomCamera, args, context) -{ - const UsdPrim& usdPrim = args.GetUsdPrim(); - MObject parentNode = context->GetMayaNode(usdPrim.GetPath().GetParentPath(), true); - return UsdMayaTranslatorCamera::Read( - UsdGeomCamera(usdPrim), - parentNode, - args, - context); -} - -PXR_NAMESPACE_CLOSE_SCOPE - diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/meshReader.cpp b/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/meshReader.cpp deleted file mode 100644 index c8bf85546c..0000000000 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/meshReader.cpp +++ /dev/null @@ -1,46 +0,0 @@ -// -// Copyright 2016 Pixar -// -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. -// -#include "pxr/pxr.h" -#include "usdMaya/primReaderRegistry.h" -#include "usdMaya/translatorMesh.h" - -#include "pxr/usd/usdGeom/mesh.h" - -PXR_NAMESPACE_OPEN_SCOPE - - -PXRUSDMAYA_DEFINE_READER(UsdGeomMesh, args, context) -{ - const UsdPrim& usdPrim = args.GetUsdPrim(); - MObject parentNode = context->GetMayaNode(usdPrim.GetPath().GetParentPath(), true); - return UsdMayaTranslatorMesh::Create( - UsdGeomMesh(usdPrim), - parentNode, - args, - context); -} - - -PXR_NAMESPACE_CLOSE_SCOPE - diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/nurbsCurvesReader.cpp b/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/nurbsCurvesReader.cpp deleted file mode 100644 index 39a57a4b30..0000000000 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/nurbsCurvesReader.cpp +++ /dev/null @@ -1,45 +0,0 @@ -// -// Copyright 2016 Pixar -// -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. -// -#include "pxr/pxr.h" -#include "usdMaya/primReaderRegistry.h" -#include "usdMaya/translatorCurves.h" - -#include "pxr/usd/usdGeom/nurbsCurves.h" - -PXR_NAMESPACE_OPEN_SCOPE - - -PXRUSDMAYA_DEFINE_READER(UsdGeomNurbsCurves, args, context) -{ - const UsdPrim& usdPrim = args.GetUsdPrim(); - MObject parentNode = context->GetMayaNode(usdPrim.GetPath().GetParentPath(), true); - return UsdMayaTranslatorCurves::Create( - UsdGeomCurves(usdPrim), - parentNode, - args, - context); -} - -PXR_NAMESPACE_CLOSE_SCOPE - diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/nurbsPatchReader.cpp b/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/nurbsPatchReader.cpp deleted file mode 100644 index a511464b87..0000000000 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/nurbsPatchReader.cpp +++ /dev/null @@ -1,49 +0,0 @@ -// -// Copyright 2016 Pixar -// -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. -// -#include "pxr/pxr.h" -#include "usdMaya/primReaderRegistry.h" -#include "usdMaya/translatorNurbsPatch.h" - -#include "pxr/usd/usd/prim.h" -#include "pxr/usd/usdGeom/nurbsPatch.h" - -#include - -PXR_NAMESPACE_OPEN_SCOPE - - - -PXRUSDMAYA_DEFINE_READER(UsdGeomNurbsPatch, args, context) -{ - const UsdPrim& usdPrim = args.GetUsdPrim(); - MObject parentNode = context->GetMayaNode(usdPrim.GetPath().GetParentPath(), true); - return UsdMayaTranslatorNurbsPatch::Read( - UsdGeomNurbsPatch(usdPrim), - parentNode, - args, - context); -} - -PXR_NAMESPACE_CLOSE_SCOPE - diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/plugin.cpp b/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/plugin.cpp deleted file mode 100644 index 3d8b4a8e55..0000000000 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/plugin.cpp +++ /dev/null @@ -1,47 +0,0 @@ -// -// Copyright 2018 Pixar -// -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. -// -#include "pxr/pxr.h" -#include "pxrUsdTranslators/api.h" - -#include -#include - - -PXR_NAMESPACE_USING_DIRECTIVE - - -PXRUSDTRANSLATORS_API -MStatus -initializePlugin(MObject obj) -{ - MFnPlugin plugin(obj, "Pixar", "1.0", "Any"); - return MStatus::kSuccess; -} - -PXRUSDTRANSLATORS_API -MStatus -uninitializePlugin(MObject /*obj*/) -{ - return MStatus::kSuccess; -} diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/scopeReader.cpp b/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/scopeReader.cpp deleted file mode 100644 index fda25dc55f..0000000000 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/scopeReader.cpp +++ /dev/null @@ -1,54 +0,0 @@ -// -// Copyright 2018 Pixar -// -// Licensed under the Apache License, Version 2.0 (the "Apache License") -// with the following modification; you may not use this file except in -// compliance with the Apache License and the following modification to it: -// Section 6. Trademarks. is deleted and replaced with: -// -// 6. Trademarks. This License does not grant permission to use the trade -// names, trademarks, service marks, or product names of the Licensor -// and its affiliates, except as required to comply with Section 4(c) of -// the License and to reproduce the content of the NOTICE file. -// -// You may obtain a copy of the Apache License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the Apache License with the above modification is -// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the Apache License for the specific -// language governing permissions and limitations under the Apache License. -// -#include "pxr/pxr.h" -#include "usdMaya/primReaderRegistry.h" -#include "usdMaya/translatorUtil.h" - -#include "pxr/usd/usd/prim.h" -#include "pxr/usd/usdGeom/scope.h" - -#include - -PXR_NAMESPACE_OPEN_SCOPE - -PXRUSDMAYA_DEFINE_READER(UsdGeomScope, args, context) -{ - const UsdPrim& usdPrim = args.GetUsdPrim(); - MObject parentNode = context->GetMayaNode( - usdPrim.GetPath().GetParentPath(), true); - - MStatus status; - MObject mayaNode; - return UsdMayaTranslatorUtil::CreateDummyTransformNode( - usdPrim, - parentNode, - /*importTypeName*/ true, - args, - context, - &status, - &mayaNode); -} - -PXR_NAMESPACE_CLOSE_SCOPE - diff --git a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/testenv/testPxrUsdTranslators.py b/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/testenv/testPxrUsdTranslators.py deleted file mode 100644 index d3f254e9af..0000000000 --- a/plugins/PXR_USDMaya/third_party/maya/plugin/pxrUsdTranslators/testenv/testPxrUsdTranslators.py +++ /dev/null @@ -1,48 +0,0 @@ -#!/pxrpythonsubst -# -# Copyright 2018 Pixar -# -# Licensed under the Apache License, Version 2.0 (the "Apache License") -# with the following modification; you may not use this file except in -# compliance with the Apache License and the following modification to it: -# Section 6. Trademarks. is deleted and replaced with: -# -# 6. Trademarks. This License does not grant permission to use the trade -# names, trademarks, service marks, or product names of the Licensor -# and its affiliates, except as required to comply with Section 4(c) of -# the License and to reproduce the content of the NOTICE file. -# -# You may obtain a copy of the Apache License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the Apache License with the above modification is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the Apache License for the specific -# language governing permissions and limitations under the Apache License. -# - - -import unittest - -from maya import cmds -from maya import standalone - - -class testPxrUsdTranslators(unittest.TestCase): - - @classmethod - def setUpClass(cls): - standalone.initialize('usd') - - @classmethod - def tearDownClass(cls): - standalone.uninitialize() - - def testLoads(self): - self.assertEqual(cmds.loadPlugin('pxrUsdTranslators'), - ["pxrUsdTranslators"]) - -if __name__ == '__main__': - unittest.main(verbosity=2)