Merge release v0.8.3

Author: pixar-oss

.travis.yml

@@ -104,7 +104,7 @@ install:
       tar -xvzf /tmp/oiio.tgz -C $HOME;
       pushd $HOME/oiio-Release-1.5.11;
       mkdir build && cd build;
-      cmake -DCMAKE_INSTALL_PREFIX=$HOME/oiio -DILMBASE_HOME=$HOME/openexr -DOPENEXR_HOME=$HOME/openexr ..;
+      cmake -DCMAKE_INSTALL_PREFIX=$HOME/oiio -DILMBASE_HOME=$HOME/openexr -DOPENEXR_HOME=$HOME/openexr -DUSE_PYTHON=OFF -DOIIO_BUILD_TOOLS=OFF -DOIIO_BUILD_TESTS=OFF ..;
       make && make install;
       popd;
     else

CHANGELOG.md

@@ -1,5 +1,113 @@
 # Change Log
 
+## [0.8.3] - 2018-02-05
+
+### Added
+- Compression in .usdc files for integer arrays and scalar floating point 
+  arrays. The latter are compressed if the values are all integers or there 
+  are a small number of unique values. In the example Kitchen Set asset on 
+  the USD website, the total size of the geometry layers decreased by ~46%, 
+  from 25 MB to 14 MB.
+
+  .usdc files with this new compression enabled are marked as version 0.6.0
+  and are not readable by earlier releases. These files are not written by
+  default; this may be enabled by setting the environment variable 
+  `USD_WRITE_NEW_USDC_FILES_AS_VERSION` to "0.6.0".
+- Ability to record and query API schemas that have been applied to a prim
+  via new Apply method on API schema classes, UsdPrim::GetAppliedSchemas and
+  UsdPrim::HasAPI. Custom API schemas should be updated with these new
+  methods by re-running usdGenSchema.
+- GetUnionedTimeSamples and GetUnionedTimeSamplesInInterval functions for
+  UsdAttribute and UsdAttributeQuery.
+- Ability to offset time for active value clips when using template clip 
+  metadata via "templateActiveOffset" entry.
+- UsdUtilsGetDirtyLayers for retrieving dirty layers used by a UsdStage.
+- GetTimeSamplesInInterval functions for UsdGeomXformOp, UsdGeomXformable 
+  and UsdGeomXformable::XformQuery.
+- UsdShadeMaterialBindingAPI, which provides an interface for binding 
+  materials to prims or collections of prims and computing the final bound
+  material for a prim via "material resolution".
+- Numerous features and documentation for UsdSkel schema.
+- "Save Flattened As" functionality in usdview.
+- Plugin mechanism in usdview that allows users to add custom commands 
+  and menus. See new tutorial for more details.
+- Partial support for RenderMan for Maya lights in the Maya plugin.
+- PxrUsdIn.BootstrapMaterialGroup op in Katana plugin for more robustly reading 
+  a Looks scope from a .usd file
+
+### Changed
+- Build now supports versioned OpenEXR and IlmBase shared libraries. (Issue #71)
+- Layer identifiers may now include '?' characters. (Issue #289)
+- UsdStage preserves payload load state when processing instancing changes.
+- UsdListPosition enum values now specify the "append" or "prepend" list as 
+  well as a position to provide users with finer-grained control.
+- The various Add... methods in Usd that take a UsdListPosition argument
+  now author entries to the back of the "prepend" list by default if no
+  "explicit" list exists. The old behavior of authoring to the (now 
+  deprecated) "added" list can be restored by setting the environment
+  variable `USD_AUTHOR_OLD_STYLE_ADD` to 1.
+- Standard schema conventions are more strictly-enforced in usdGenSchema.
+- UsdCollectionAPI::AddCollection has been renamed ApplyCollection.
+- Enabled authoring of new UsdShade encoding by default. Authoring the old
+  (now deprecated) encoding can be restored by setting the environment variable 
+  `USD_SHADE_WRITE_NEW_ENCODING` to 0.
+- The "joints" relationship on the UsdSkelSkeleton, UsdSkelPackedJointAnimation,
+  and UsdSkelBinding API schemas is now a token array-valued attribute.
+- UsdRiStatements API schema has been renamed to UsdRiStatementsAPI.
+- sdfdump utility now shows all specs in a layer, even if they have no fields.
+- Various improvements to Hydra reprs and geometry processing.
+- More improvements to Hydra's handling of invalid data.
+- Ongoing work to prepare Hydra to fully consume UsdShade schemas.
+- Refactored GL dependency out of Hd library.
+- Built-in variables in usdview interpreter are now accessed through a separate
+  usdviewApi object to avoid name collisions.
+- Performance improvements in Maya plugin when in Viewport 2.0.
+- Inclusion of info.usd.opArgs in Katana plugin is now parameterized; it will
+  be authored to the location where a "setOpArgsToInfo" attribute exists and is
+  set to 1.
+
+### Deprecated
+- The "added" list for list ops in scene description is deprecated in favor 
+  of the "prepend" and "append" lists.
+
+### Removed
+- GfCamera::ZUp and GfCamera::YUp.
+- UsdSkelJoint schema.
+
+### Fixed
+- build_usd.py ensures OpenImageIO build does not pick up OpenEXR from other 
+  locations, which could have led to runtime errors. (Issue #315, Issue #325)
+- Headers are now installed properly for monolithic builds. (Issue #277)
+- Original install location will no longer be searched for plugins after
+  relocating builds. (Issue #363)
+- Fixed thread-safety issue where plugins with the same name but in different
+  locations could be loaded twice. (Issue #358)
+- Fixed bug where layers that were muted via SdfLayer::AddToMutedLayers before
+  they were first opened could not be unmuted.
+- Fixed bug in usdGenSchema where changing an existing property's type in a 
+  schema would not be reflected in the generated code.
+- Fixed bug where a large (> 1460) number of variants in a .usda file would
+  cause a "memory exhausted" error when parsing that file.
+- Fixed broken pread mode for .usdc files.
+- Fixed bug that caused UsdStage::CreateNew to crash on Windows. (Issue #364)
+- Fixed bug when using a UsdStagePopulationMask with prims beneath instances. 
+  (Issue #312)
+- Fixed bug where setting float-valued attributes to +inf in Python would fail.
+- UsdAttribute::GetTimeSamplesInInterval now properly accounts for layer 
+  offsets. (Issue #352)
+- Internal references or empty asset paths no longer cause errors in 
+  UsdUtilsFlattenLayerStack.
+- Fixed bug where UsdGeomPrimvar::GetTimeSamples would miss time samples for
+  indexed primvars.
+- Disabled tiny prim culling in Hydra by default. It can be re-enabled by
+  setting the environment variable `HD_ENABLE_TINY_PRIM_CULLING` to 1.
+  (Issue #314)
+- Fixed issues with using non-file-backed asset paths in various utilities
+  and Maya and Katana plugins.
+- Houdini plugin explicitly links against required libraries to avoid runtime
+  errors with Houdini 16.5.
+- Fixed several bugs with point instancing support in Houdini plugin.
+
 ## [0.8.2] - 2017-12-01
 
 Release 0.8.2 increments the file format version for .usdc files. New .usdc

build_scripts/build_usd.py

@@ -556,20 +556,14 @@ def InstallPNG(context, force):
 def InstallOpenEXR(context, force):
     srcDir = DownloadURL(OPENEXR_URL, context, force)
 
-    # Specify NAMESPACE_VERSIONING=OFF so that the built libraries
-    # don't have the version appended to their filename. USD's
-    # FindOpenEXR module can't handle that right now -- see 
-    # https://github.com/PixarAnimationStudios/USD/issues/71
     ilmbaseSrcDir = os.path.join(srcDir, "IlmBase")
     with CurrentWorkingDirectory(ilmbaseSrcDir):
-        RunCMake(context, force,
-                 ['-DNAMESPACE_VERSIONING=OFF'])
+        RunCMake(context, force)
 
     openexrSrcDir = os.path.join(srcDir, "OpenEXR")
     with CurrentWorkingDirectory(openexrSrcDir):
         RunCMake(context, force,
-                 ['-DNAMESPACE_VERSIONING=OFF',
-                  '-DILMBASE_PACKAGE_PREFIX="{instDir}"'
+                 ['-DILMBASE_PACKAGE_PREFIX="{instDir}"'
                   .format(instDir=context.instDir)])
 
 OPENEXR = Dependency("OpenEXR", InstallOpenEXR, "include/OpenEXR/ImfVersion.h")
@@ -657,6 +651,16 @@ def InstallOpenImageIO(context, force):
                      '-DOIIO_BUILD_TESTS=OFF',
                      '-DSTOP_ON_WARNING=OFF']
 
+        # OIIO's FindOpenEXR module circumvents CMake's normal library 
+        # search order, which causes versions of OpenEXR installed in
+        # /usr/local or other hard-coded locations in the module to
+        # take precedence over the version we've built, which would 
+        # normally be picked up when we specify CMAKE_PREFIX_PATH. 
+        # This may lead to undefined symbol errors at build or runtime. 
+        # So, we explicitly specify the OpenEXR we want to use here.
+        extraArgs.append('-DOPENEXR_HOME="{instDir}"'
+                         .format(instDir=context.instDir))
+
         # If Ptex support is disabled in USD, disable support in OpenImageIO
         # as well. This ensures OIIO doesn't accidentally pick up a Ptex
         # library outside of our build.

cmake/defaults/Packages.cmake

@@ -46,6 +46,7 @@ if(PXR_ENABLE_PYTHON_SUPPORT)
     find_package(Boost
         COMPONENTS
             date_time
+            filesystem
             program_options
             python
             regex
@@ -62,6 +63,7 @@ else()
     find_package(Boost
         COMPONENTS
             date_time
+            filesystem
             program_options
             regex
             system

cmake/defaults/Version.cmake

@@ -24,4 +24,4 @@
 # Versioning information
 set(PXR_MAJOR_VERSION "0")
 set(PXR_MINOR_VERSION "8")
-set(PXR_PATCH_VERSION "2")
+set(PXR_PATCH_VERSION "3")

cmake/macros/Private.cmake

@@ -1174,14 +1174,12 @@ function(_pxr_library NAME)
     endif()
 
     # Names and paths passed to the compile via macros.  Paths should be
-    # relative to facilitate relocating the build.  installLocation is
-    # absolute but the client can override with any path, including a
-    # relative one.
+    # relative to facilitate relocating the build.
     _get_python_module_name(${NAME} pythonModuleName)
     string(TOUPPER ${NAME} uppercaseName)
-    set(installLocation "${CMAKE_INSTALL_PREFIX}/share/usd/plugins")
     if(PXR_INSTALL_LOCATION)
-        file(TO_CMAKE_PATH "${PXR_INSTALL_LOCATION}" installLocation)
+        file(TO_CMAKE_PATH "${PXR_INSTALL_LOCATION}" pxrInstallLocation)
+        set(pxrInstallLocation "PXR_INSTALL_LOCATION=${pxrInstallLocation}")
     endif()
 
     # API macros.
@@ -1266,9 +1264,9 @@ function(_pxr_library NAME)
             MFB_PACKAGE_NAME=${PXR_PACKAGE}
             MFB_ALT_PACKAGE_NAME=${PXR_PACKAGE}
             MFB_PACKAGE_MODULE=${pythonModuleName}
-            "PXR_BUILD_LOCATION=../share/usd/plugins"
-            "PXR_PLUGIN_BUILD_LOCATION=../plugin/usd"
-            "PXR_INSTALL_LOCATION=${installLocation}"
+            PXR_BUILD_LOCATION=../share/usd/plugins
+            PXR_PLUGIN_BUILD_LOCATION=../plugin/usd
+            ${pxrInstallLocation}
             ${pythonModulesEnabled}
             ${apiPrivate}
     )
@@ -1305,7 +1303,15 @@ function(_pxr_library NAME)
     # Set up the install.
     #
 
-    if(NOT isObject)
+    if(isObject)
+        get_target_property(install_headers ${NAME} PUBLIC_HEADER)
+        if (install_headers)
+            install(
+                FILES ${install_headers}
+                DESTINATION ${headerInstallPrefix}
+            )
+        endif()
+    else()
         if(BUILD_SHARED_LIBS AND NOT PXR_BUILD_MONOLITHIC)
             install(
                 TARGETS ${NAME}

cmake/macros/Public.cmake

@@ -560,7 +560,7 @@ endfunction() # pxr_install_test_dir
 function(pxr_register_test TEST_NAME)
     if (PXR_BUILD_TESTS)
         cmake_parse_arguments(bt
-            "PYTHON;REQUIRES_SHARED_LIBS;REQUIRES_PYTHON_MODULES" 
+            "RUN_SERIAL;PYTHON;REQUIRES_SHARED_LIBS;REQUIRES_PYTHON_MODULES" 
             "CUSTOM_PYTHON;COMMAND;STDOUT_REDIRECT;STDERR_REDIRECT;DIFF_COMPARE;POST_COMMAND;POST_COMMAND_STDOUT_REDIRECT;POST_COMMAND_STDERR_REDIRECT;PRE_COMMAND;PRE_COMMAND_STDOUT_REDIRECT;PRE_COMMAND_STDERR_REDIRECT;FILES_EXIST;FILES_DONT_EXIST;CLEAN_OUTPUT;EXPECTED_RETURN_CODE;TESTENV"
             "ENV;PRE_PATH;POST_PATH"
             ${ARGN}
@@ -706,6 +706,12 @@ function(pxr_register_test TEST_NAME)
             COMMAND ${PYTHON_EXECUTABLE} ${testWrapperCmd}
                     "--env-var=PYTHONPATH=${_testPythonPath}" ${testCmd}
         )
+
+        # But in some cases, we need to pass cmake properties directly to cmake
+        # run_test, rather than configuring the environment
+        if (bt_RUN_SERIAL)
+            set_tests_properties(${TEST_NAME} PROPERTIES RUN_SERIAL TRUE)
+        endif()
     endif()
 endfunction() # pxr_register_test
 

cmake/modules/FindHoudini.cmake

@@ -45,6 +45,21 @@
 #  HOUDINI_BUILD_VERSION
 #  HOUDINI_INCLUDE_DIRS
 #  HOUDINI_LIBRARY_DIRS
+#  HOUDINI_LIBRARIES
+#  HOUDINI_APPS1_LIBRARY
+#  HOUDINI_APPS2_LIBRARY
+#  HOUDINI_APPS3_LIBRARY
+#  HOUDINI_DEVICE_LIBRARY
+#  HOUDINI_GEO_LIBRARY
+#  HOUDINI_OP1_LIBRARY
+#  HOUDINI_OP2_LIBRARY
+#  HOUDINI_OP3_LIBRARY
+#  HOUDINI_OPZ_LIBRARY
+#  HOUDINI_PRM_LIBRARY
+#  HOUDINI_RAY_LIBRARY
+#  HOUDINI_SIM_LIBRARY
+#  HOUDINI_UI_LIBRARY
+#  HOUDINI_UT_LIBRARY
 
 find_path(HOUDINI_BASE_DIR
     NAMES
@@ -78,6 +93,35 @@ find_path(HOUDINI_LIB_DIRS
         "Houdini Development Kit Library Path"
 )
 
+foreach(HOUDINI_LIB
+    APPS1
+    APPS2
+    APPS3
+    DEVICE
+    GEO
+    OP1
+    OP2
+    OP3
+    OPZ
+    PRM
+    RAY
+    SIM
+    UI
+    UT)
+    find_library(HOUDINI_${HOUDINI_LIB}_LIBRARY
+            Houdini${HOUDINI_LIB}
+        HINTS
+            "${HOUDINI_LIB_DIRS}"
+        DOC
+            "Houdini's ${HOUDINI_LIB} library path"
+        NO_CMAKE_SYSTEM_PATH
+    )
+
+    if (HOUDINI_${HOUDINI_LIB}_LIBRARY)
+        list(APPEND HOUDINI_LIBRARIES ${HOUDINI_${HOUDINI_LIB}_LIBRARY})
+    endif ()
+endforeach()
+
 if(HOUDINI_INCLUDE_DIRS AND EXISTS "${HOUDINI_INCLUDE_DIRS}/SYS/SYS_Version.h")
     foreach(comp FULL MAJOR MINOR BUILD)
         file(STRINGS