Merge release v19.07

Author: pixar-oss

BUILDING.md

@@ -182,6 +182,20 @@ Embree 2.16.1. The additional dependencies that must be supplied when invoking c
 | --------------        | -----------------------------------         | -------   |
 | EMBREE_LOCATION       | The root path to an embree library install. | 2.16.1    |
 
+##### RenderMan Rendering
+
+This plugin uses Pixar's RenderMan as a rendering backend for Hydra and 
+usdview. Enable the plugin in the build by specifying the cmake flag 
+```PXR_BUILD_PRMAN_PLUGIN=TRUE``` when invoking cmake. This plugin is 
+compatible with RenderMan 22.5.  The additional dependencies that must be 
+supplied when invoking cmake are:
+
+| Dependency Name       | Description                                 | Version   |
+| --------------        | -----------------------------------         | -------   |
+| RENDERMAN_LOCATION    | The root path to an RenderMan install.      | 22.5      |
+
+More documentation is available [here](http://openusd.org/docs/RenderMan-USD-Imaging-Plugin.html).
+
 ## Third Party Plugins
 
 USD provides several plugins for integration with third-party software packages,

CHANGELOG.md

@@ -1,5 +1,130 @@
 # Change Log
 
+## [19.07] - 2019-06-17
+
+### Build
+- Improved detection of GLEW and Ptex libraries during build. (PR #808)
+- Fixed bug in build_usd.py that caused errors when specifying the
+  "Xcode" CMake generator.
+
+### USD:
+- Various optimizations and cleanups in trace library.
+- Added iterator-based construction for VtArray. (PR #644)
+- Added Python bindings for ArResolver::RefreshContext. (PR #820)
+- Fixed incorrect results from NdrRegistry::GetAllNodeSourceTypes.
+- Removed unused spec types from Sdf.
+- Reimplemented SdfPath. The new implementation dramatically improves the
+  performance of creating property paths, which is a key part of value
+  resolution.
+- SdfFileFormat::IsStreamingLayer was moved to SdfAbstractData::StreamsData.
+  SdfAbstractData implementations are now responsible for expressing
+  whether they stream data from their back-end instead of SdfFileFormat.
+- Added file format arguments to SdfLayer::CreateAnonymous to match CreateNew.
+- Fixed bug where strings in scene description that look like format
+  specifiers would be interpreted as such during .usda output.
+- Added dynamic payloads feature. Dynamic payloads allow file formats to
+  procedurally generate a layer using metadata authored on the prim where the
+  layer is introduced via a payload arc. See examples and "Advanced Features"
+  documentation for more details.
+- Fixed erroneous composition cycle detection for subroot references to
+  sibling prims across reference boundaries.
+- Added support for "schemaTokens" customData entry in schema.usda. This
+  allows developers to associate tokens with a particular schema for clarity
+  and organization. These tokens will continue to be emitted into the
+  standard tokens.h and tokens.cpp files in each schema library.
+- Removed deprecated UsdListPositionTempDefault and USD_AUTHOR_OLD_STYLE_ADD
+  environment variable.
+- Improved error detection for truncated .usdc files.
+- Improved error messages and debug output for USD schema generation.
+  (PR #427, PR #478)
+- Fixed various issues that caused build errors on Windows. (Issue #812)
+- Fixed bug that caused corrupt .usdc files to be created in certain rare
+  cases. (Issue #811)
+- Fixed bug where asset-valued stage metadata would not be resolved.
+- Calling Usd.Prim.IsDefined on a null prim in Python now raises a
+  Python exception. (Issue #753)
+- Fixed bug in UsdUtils dependency extraction and .usdz creation where
+  asset dependencies in layer metadata were ignored.
+- Improved integer encoding and fixed a source of non-deterministic output
+  in .usdc file format. (Issue #830)
+- Added ability to usdcat to only show layer metadata via --layerMetadata
+  command-line flag.
+- UsdGeomBasisCurves schema now accepts "pinned" as a valid value for
+  wrapping to represent pinned curves.
+- UsdGeomPointInstancer will now use the "append" list op when authoring
+  inactiveIds metadata instead of the deprecated "added" list op. This
+  behavior can be reverted by setting the environment variable
+  `USDGEOM_POINTINSTANCER_NEW_APPLYOPS` to 0, but this will be removed
+  in a future release.
+- Added UsdShadeCoordSysAPI schema for representing coordinate systems.
+- Added shaping:ies:normalize attribute to UsdLuxShapingAPI.
+- Numerous fixes and improvements to UsdSkel schemas.
+
+### Imaging:
+- Added early version of RenderMan Hydra render delegate with support for
+  geometry,material networks, lights, volumes, coordinate systems and more!
+- Added support for coordinate systems in Hydra and UsdImaging.
+- Added support for categories per instance in Hydra to support light linking
+  to individual instances.
+- Added order independent transparency (OIT) to Hydra GL.
+- Added support for backend-independent picking and highlighting.
+- Improved Hydra support for scenegraph cameras.
+- Added support for instance-rate primvar queries in Hydra GL shading code.
+- Added support for generating normals for picking hits in Hydra GL.
+- Added "DontConform" camera window policy.
+- Added support for picking points in Hydra GL.
+- Added depth compositing to HdxColorizeTask.
+- Render delegates can now access "velocities" attribute on point-based schemas.
+  (PR #824)
+- Refactored and clarified use of "path" and "prim" terminology in UsdImaging.
+- Removed HdChangeTracker::MarkAllCollectionsDirty
+- Removed render tags API from HdRprimCollection. They have become a Hydra
+  task concept.
+- Fixed instancing-related crashes in UsdImaging. (Issue #838, Issue #847)
+- Added usdAppUtils library containing common functionality and utilities
+  for applications that view USD stages.
+- Added initial version of usdrecord command line tool for generating images
+  from a USD file.
+- Added "debug flags" configuration dialog in usdview.
+- Added ability to specify first/last/current frame when launching usdview
+  via "--ff", "--lf", and "--cf" command line parameters. (PR #832)
+- Numerous correctness, interaction, and performance improvements to usdview's
+  transport control (frame slider). (PR #770)
+
+### Alembic Plugin:
+- Added support for Alembic 1.7.9. (PR #825)
+
+### Houdini Plugin:
+- Support for Houdini 16.0 is deprecated. We anticipate bumping the minimum
+  version requirement to 16.5 and dropping 16.0 support in the next release.
+- Fixed bug which could cause visibility to be incorrect.
+- Added support for export of additional primvar types.
+- Fixed bug which could cause incorrect attribute typeinfo when importing
+  array attributes.
+- Added support for additional OSD subdiv interpolation tags.
+- Added support for targeting the default prim on import via a reserved
+  "defaultPrim" prim path.
+- Miscellaneous improvements for converting between UsdSkel and Agent
+  primitives.
+
+### Katana Plugin:
+- Added support for reading and resolving collection-based material bindings to
+  PxrUsdIn. This is done as a two stage process in which bindings (for the
+  purposes specified in "additionalBindingPurposeNames") are added within a
+  "usd.materialBindings" group attribute. The PxrUsdInResolveMaterialBindings
+  node (and its corresponding Op) transfers a purpose's binding to the
+  system-level "materialAssign" attribute and optionally filters inherited
+  redundancy.
+- The "info.usd" attributes which advertise which API schemas are applied can
+  be created in either array or group attribute form. The latter is convenient
+  to match against via CEL.
+
+### Maya Plugin:
+- Add support for exporting assembly edits on pxrUsdReferenceAssembly nodes.
+- Expose controls for tweaking selection parameters in pxrHdImagingShape.
+- Importing shaders and lights will use mel commands to property add shaders
+  to hypershade and lights to the defaultLightSet.
+
 ## [19.05] - 2019-04-10
 
 ### Build

CMakeLists.txt

@@ -67,6 +67,10 @@ if (${PXR_BUILD_HOUDINI_PLUGIN})
     add_subdirectory(third_party/houdini)
 endif()
 
+if (${PXR_BUILD_PRMAN_PLUGIN})
+    add_subdirectory(third_party/renderman-${RENDERMAN_VERSION_MAJOR})
+endif()
+
 if (${PXR_BUILD_DOCUMENTATION})
     # Ensure we have doxygen+graphviz available
     find_program(DOXYGEN_EXECUTABLE

LICENSE.txt

@@ -447,3 +447,16 @@ AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
 ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION    
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 
 
+============================================================
+pugixml
+============================================================
+
+MIT License
+
+Copyright (c) 2006-2019 Arseny Kapoulkine
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

build_scripts/build_usd.py

@@ -243,6 +243,16 @@ def CopyDirectory(context, srcDir, destDir):
                        .format(srcDir=srcDir, destDir=instDestDir))
     shutil.copytree(srcDir, instDestDir)
 
+def FormatMultiProcs(numJobs, generator):
+    tag = "-j"
+    if generator:
+        if "Visual Studio" in generator:
+            tag = "/M:"
+        elif "Xcode" in generator:
+            tag = "-j "
+
+    return "{tag}{procs}".format(tag=tag, procs=numJobs)
+
 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."""
@@ -301,10 +311,7 @@ def RunCMake(context, force, extraArgs = None):
                     extraArgs=(" ".join(extraArgs) if extraArgs else "")))
         Run("cmake --build . --config {config} --target install -- {multiproc}"
             .format(config=config,
-                    multiproc=("/M:{procs}"
-                               if generator and "Visual Studio" in generator
-                               else "-j{procs}")
-                              .format(procs=context.numJobs)))
+                    multiproc=FormatMultiProcs(context.numJobs, generator)))
 
 def PatchFile(filename, patches, multiLineMatches=False):
     """Applies patches to the specified file. patches is a list of tuples
@@ -1111,6 +1118,14 @@ def InstallUSD(context, force, buildArgs):
                 extraArgs.append('-DPXR_BUILD_EMBREE_PLUGIN=ON')
             else:
                 extraArgs.append('-DPXR_BUILD_EMBREE_PLUGIN=OFF')
+
+            if context.buildPrman:
+                if context.prmanLocation:
+                    extraArgs.append('-DRENDERMAN_LOCATION="{location}"'
+                                     .format(location=context.prmanLocation))
+                extraArgs.append('-DPXR_BUILD_PRMAN_PLUGIN=ON')
+            else:
+                extraArgs.append('-DPXR_BUILD_PRMAN_PLUGIN=OFF')                
 
             if context.buildOIIO:
                 extraArgs.append('-DPXR_BUILD_OPENIMAGEIO_PLUGIN=ON')
@@ -1355,6 +1370,14 @@ def InstallUSD(context, force, buildArgs):
 group.add_argument("--embree-location", type=str,
                    help="Directory where Embree is installed.")
 subgroup = group.add_mutually_exclusive_group()
+subgroup.add_argument("--prman", dest="build_prman", action="store_true",
+                      default=False,
+                      help="Build Pixar's RenderMan imaging plugin")
+subgroup.add_argument("--no-prman", dest="build_prman", action="store_false",
+                      help="Do not build Pixar's RenderMan imaging plugin (default)")
+group.add_argument("--prman-location", type=str,
+                   help="Directory where Pixar's RenderMan is installed.")
+subgroup = group.add_mutually_exclusive_group()
 subgroup.add_argument("--openimageio", dest="build_oiio", action="store_true", 
                       default=False,
                       help="Build OpenImageIO plugin for USD")
@@ -1508,6 +1531,9 @@ def __init__(self, args):
         self.buildEmbree = self.buildImaging and args.build_embree
         self.embreeLocation = (os.path.abspath(args.embree_location)
                                if args.embree_location else None)
+        self.buildPrman = self.buildImaging and args.build_prman
+        self.prmanLocation = (os.path.abspath(args.prman_location)
+                               if args.prman_location else None)                               
         self.buildOIIO = args.build_oiio
         self.buildOCIO = args.build_ocio
 
@@ -1741,6 +1767,7 @@ def ForceBuildDependency(self, dep):
       Ptex support:             {enablePtex}
       OpenImageIO support:      {buildOIIO} 
       OpenColorIO support:      {buildOCIO} 
+      PRMan support:            {buildPrman}
     UsdImaging                  {buildUsdImaging}
       usdview:                  {buildUsdview}
     Python support              {buildPython}
@@ -1789,6 +1816,7 @@ def FormatBuildArguments(buildArgs):
     enablePtex=("On" if context.enablePtex else "Off"),
     buildOIIO=("On" if context.buildOIIO else "Off"),
     buildOCIO=("On" if context.buildOCIO else "Off"),
+    buildPrman=("On" if context.buildPrman else "Off"),
     buildUsdImaging=("On" if context.buildUsdImaging else "Off"),
     buildUsdview=("On" if context.buildUsdview else "Off"),
     buildPython=("On" if context.buildPython else "Off"),
@@ -1885,3 +1913,7 @@ def FormatBuildArguments(buildArgs):
 if context.buildHoudini:
     Print("See documentation at http://openusd.org/docs/Houdini-USD-Plugins.html "
           "for setting up the Houdini plugin.\n")
+
+if context.buildPrman:
+    Print("See documentation at http://openusd.org/docs/RenderMan-USD-Imaging-Plugin.html "
+          "for setting up the RenderMan plugin.\n")

cmake/defaults/Options.cmake

@@ -35,6 +35,7 @@ option(PXR_BUILD_KATANA_PLUGIN "Build usd katana plugin" OFF)
 option(PXR_BUILD_MAYA_PLUGIN "Build usd maya plugin" OFF)
 option(PXR_BUILD_ALEMBIC_PLUGIN "Build the Alembic plugin for USD" OFF)
 option(PXR_BUILD_HOUDINI_PLUGIN "Build the Houdini plugin for USD" OFF)
+option(PXR_BUILD_PRMAN_PLUGIN "Build the PRMan imaging plugin" OFF)
 option(PXR_BUILD_MATERIALX_PLUGIN "Build the MaterialX plugin for USD" OFF)
 option(PXR_BUILD_DOCUMENTATION "Generate doxygen documentation" OFF)
 option(PXR_ENABLE_GL_SUPPORT "Enable OpenGL based components" ON)
@@ -196,3 +197,11 @@ if (${PXR_BUILD_HOUDINI_PLUGIN})
         set(PXR_BUILD_HOUDINI_PLUGIN "OFF" CACHE BOOL "" FORCE)
     endif()
 endif()
+
+if (${PXR_BUILD_PRMAN_PLUGIN})
+    if (NOT ${PXR_BUILD_IMAGING})
+        message(STATUS
+            "Setting PXR_BUILD_PRMAN_PLUGIN=OFF because PXR_BUILD_IMAGING=OFF")
+        set(PXR_BUILD_PRMAN_PLUGIN "OFF" CACHE BOOL "" FORCE)
+    endif()
+endif()

cmake/defaults/Packages.cmake

@@ -157,6 +157,10 @@ if (PXR_BUILD_HOUDINI_PLUGIN)
     find_package(Houdini REQUIRED)
 endif()
 
+if (PXR_BUILD_PRMAN_PLUGIN)
+    find_package(Renderman REQUIRED)
+endif()
+
 if (PXR_BUILD_ALEMBIC_PLUGIN)
     find_package(Alembic REQUIRED)
     find_package(OpenEXR REQUIRED)

cmake/defaults/Version.cmake

@@ -24,4 +24,4 @@
 # Versioning information
 set(PXR_MAJOR_VERSION "0")
 set(PXR_MINOR_VERSION "19")
-set(PXR_PATCH_VERSION "5")
+set(PXR_PATCH_VERSION "7")

cmake/macros/Private.cmake

@@ -1190,8 +1190,8 @@ function(_pxr_library NAME)
     # these libraries are not separately loadable at runtime. In these cases,
     # we don't need to specify the library's location, so we leave
     # pluginToLibraryPath empty.
-    if(";${PXR_CORE_LIBS};" MATCHES ";${NAME};")
-        if (NOT _building_monolithic AND NOT args_TYPE STREQUAL "STATIC")
+    if(NOT args_TYPE STREQUAL "STATIC")
+   	if(NOT (";${PXR_CORE_LIBS};" MATCHES ";${NAME};" AND _building_monolithic))
             file(RELATIVE_PATH
                 pluginToLibraryPath
                 ${CMAKE_INSTALL_PREFIX}/${pluginInstallPrefix}/${NAME}

cmake/modules/FindGLEW.cmake

@@ -85,7 +85,9 @@ if (${CMAKE_HOST_UNIX})
             GLEW glew
         HINTS
             "${GLEW_LOCATION}/lib"
+            "${GLEW_LOCATION}/lib64"
             "$ENV{GLEW_LOCATION}/lib"
+            "$ENV{GLEW_LOCATION}/lib64"
         PATHS
             "${GLEW_LOCATION}/lib"
             /usr/lib64