PixarAnimationStudios · pixar-oss · Sep 21, 2016 · Sep 12, 2016 · Sep 12, 2016 · Sep 14, 2016
diff --git a/BUILDING.md b/BUILDING.md
@@ -40,13 +40,13 @@ These plugins are not built by default and must be enabled via the instructions
 
 ##### Alembic Plugin
 
-Enable the [Alembic](https://https://github.com/alembic/alembic) plugin in the build
+Enable the [Alembic](https://github.com/alembic/alembic) plugin in the build
 by specifying the cmake flag ```PXR_BUILD_ALEMBIC_PLUGIN=TRUE``` when invoking cmake.
 This plugin is compatible with Alembic 1.5.2. The additional dependencies that must be supplied when invoking cmake are:
 
 | Dependency Name    | Description                                                             | Version |
 | ------------------ |-----------------------------------------------------------------------  | ------- |
-| ALEMBIC_LOCATION   | The location of [Alembic](https://https://github.com/alembic/alembic)   | 1.5.2   |
+| ALEMBIC_LOCATION   | The location of [Alembic](https://github.com/alembic/alembic)           | 1.5.2   |
 | HDF5_LOCATION      | The location of [HDF5](https://www.hdfgroup.org/HDF5/)                  | 1.8.11  |
 
 For further information see the documentation on the Alembic plugin [here](http://openusd.org/docs/Alembic-USD-Plugin.html).

diff --git a/cmake/defaults/Options.cmake b/cmake/defaults/Options.cmake
@@ -27,8 +27,9 @@ option(PXR_BUILD_IMAGING "Build imaging components" ON)
 option(PXR_BUILD_USD_IMAGING "Build USD imaging components" ON)
 option(PXR_BUILD_KATANA_PLUGIN "Build usd katana plugin" ON)
 option(PXR_BUILD_MAYA_PLUGIN "Build usd maya plugin" ON)
-option(PXR_BUILD_ALEMBIC_PLUGIN "Build the Alembic plugin for USD" OFF)
+option(PXR_BUILD_ALEMBIC_PLUGIN "Build the Alembic plugin for USD" ON)
 option(PXR_MAYA_TBB_BUG_WORKAROUND "Turn on linker flag (-Wl,-Bsymbolic) to work around a Maya TBB bug" OFF)
+option(PXR_HYBRID_BUILD_MODE "Build USD in release with symbols and optimisations disabled" ON)
 
 set(PXR_INSTALL_LOCATION ""
     CACHE

diff --git a/cmake/macros/Public.cmake b/cmake/macros/Public.cmake
@@ -565,6 +565,16 @@ function(pxr_plugin PLUGIN_NAME)
         )
     endif()
 
+    if(sl_CPPFILES)
+        pxr_add_filename_property(${PLUGIN_NAME} "${sl_CPPFILES}")
+    endif()
+    if(sl_PRIVATE_CLASSES)
+        pxr_add_filename_property(${PLUGIN_NAME} "${sl_PRIVATE_CLASSES}")
+    endif()
+    if(sl_PUBLIC_CLASSES)
+        pxr_add_filename_property(${PLUGIN_NAME} "${sl_PUBLIC_CLASSES}")
+    endif()
+
     # Plugins do not have a lib* prefix like usual shared libraries
     set_target_properties(${PLUGIN_NAME} PROPERTIES PREFIX "")
 
@@ -626,11 +636,15 @@ function(pxr_plugin PLUGIN_NAME)
         PREFIX ${PXR_PREFIX}
     )
 
+    string(TOUPPER ${PLUGIN_NAME} ucLibName)
+
     set_target_properties(${PLUGIN_NAME}
         PROPERTIES
             PUBLIC_HEADER
                 "${sl_PUBLIC_HEADERS};${${PLUGIN_NAME}_PUBLIC_HEADERS}"
             INTERFACE_INCLUDE_DIRECTORIES ""
+            DEFINE_SYMBOL
+                "${ucLibName}_EXPORTS"
     )
 
     # Install and include headers from the build directory.

diff --git a/cmake/modules/FindDoubleConversion.cmake b/cmake/modules/FindDoubleConversion.cmake
@@ -26,10 +26,12 @@ set(LIBRARY_PATHS
     /usr/local/lib
     /lib
     /lib64
+    ${DOUBLE_CONVERSION_DIR}/lib
 )
 
 find_path(DOUBLE_CONVERSION_INCLUDE_DIR
     double-conversion/double-conversion.h
+    PATHS ${DOUBLE_CONVERSION_DIR}/include
 )
 
 find_library(DOUBLE_CONVERSION_LIBRARY

diff --git a/cmake/modules/FindMaya.cmake b/cmake/modules/FindMaya.cmake
@@ -223,11 +223,21 @@ endif()
 # all listed variables are TRUE
 include(FindPackageHandleStandardArgs)
 
-find_package_handle_standard_args(Maya
-    REQUIRED_VARS
-        MAYA_EXECUTABLE
-        MAYA_INCLUDE_DIRS
-        MAYA_LIBRARIES
-    VERSION_VAR
-        MAYA_API_VERSION
-)
+if (${PXR_MAYA_API_ONLY} AND NOT ${PXR_MAYA_API_ONLY})
+    find_package_handle_standard_args(Maya
+        REQUIRED_VARS
+            MAYA_EXECUTABLE
+            MAYA_INCLUDE_DIRS
+            MAYA_LIBRARIES
+        VERSION_VAR
+            MAYA_API_VERSION
+    )
+else()
+    find_package_handle_standard_args(Maya
+        REQUIRED_VARS
+            MAYA_INCLUDE_DIRS
+            MAYA_LIBRARIES
+        VERSION_VAR
+            MAYA_API_VERSION
+    )
+endif()
diff --git a/cmake/modules/FindOpenEXR.cmake b/cmake/modules/FindOpenEXR.cmake
@@ -84,6 +84,7 @@ endif()
 foreach(OPENEXR_LIB
     Half
     Iex
+    IexMath
     Imath
     IlmImf
     IlmThread

diff --git a/extras/usd/examples/CMakeLists.txt b/extras/usd/examples/CMakeLists.txt
@@ -1,8 +1,6 @@
 set(PXR_PREFIX examples)
 set(PXR_INSTALL_SUBDIR share/usd/examples)
 
-if(UNIX)
-    add_subdirectory(usdObj)
-    add_subdirectory(usdSchemaExamples)
-    add_subdirectory(usdMakeFileVariantModelAsset)
-endif()
+add_subdirectory(usdObj)
+add_subdirectory(usdSchemaExamples)
+add_subdirectory(usdMakeFileVariantModelAsset)
diff --git a/extras/usd/examples/usdObj/fileFormat.h b/extras/usd/examples/usdObj/fileFormat.h
@@ -24,7 +24,8 @@
 #ifndef USDOBJ_FILE_FORMAT_H
 #define USDOBJ_FILE_FORMAT_H
 
-#include "Python.h" 
+#include "Python.h"
+#include "pxr/base/arch/api.h"
 #include "pxr/usd/sdf/fileFormat.h"
 #include "pxr/base/tf/staticTokens.h"
 #include <iosfwd>
@@ -35,7 +36,8 @@
     ((Version, "1.0"))                  \
     ((Target,  "usd"))
 
-TF_DECLARE_PUBLIC_TOKENS(UsdObjFileFormatTokens, USDOBJ_FILE_FORMAT_TOKENS);
+TF_DECLARE_PUBLIC_TOKENS(UsdObjFileFormatTokens, ARCH_EXPORT,
+                         USDOBJ_FILE_FORMAT_TOKENS);
 
 TF_DECLARE_WEAK_AND_REF_PTRS(UsdObjFileFormat);
 TF_DECLARE_WEAK_AND_REF_PTRS(SdfLayerBase);

diff --git a/extras/usd/examples/usdSchemaExamples/tokens.h b/extras/usd/examples/usdSchemaExamples/tokens.h
@@ -27,12 +27,13 @@
 /// \file usdSchemaExamples/tokens.h
 
 // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-// 
+//
 // This is an automatically generated file (by usdGenSchema.py).
 // Do not hand-edit!
-// 
+//
 // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 
+#include "pxr/base/arch/api.h"
 #include "pxr/base/tf/staticTokens.h"
 
 /// \hideinitializer
@@ -70,6 +71,7 @@
 /// \li <b>paramsVelocity</b> - UsdSchemaExamplesParamsAPI
 /// \li <b>paramsVolume</b> - UsdSchemaExamplesParamsAPI
 /// \li <b>target</b> - UsdSchemaExamplesSimple
-TF_DECLARE_PUBLIC_TOKENS(UsdSchemaExamplesTokens, USDSCHEMAEXAMPLES_TOKENS);
+TF_DECLARE_PUBLIC_TOKENS(UsdSchemaExamplesTokens, ARCH_EXPORT,
+                         USDSCHEMAEXAMPLES_TOKENS);
 
 #endif
diff --git a/extras/usd/tutorials/endToEnd/tutorial_scripts/add_shadingVariants.py b/extras/usd/tutorials/endToEnd/tutorial_scripts/add_shadingVariants.py
@@ -93,7 +93,6 @@ def _AddShadingToBall(stage):
         with shadingVariant.GetVariantEditContext():
             whichBall = variantName.split('_')[-1]
             texPath = os.path.join(texDir, 'ball%s.tex' % whichBall)
-            texPath = texPath.replace('\\', '/')
             # in the current variant, modify the color
             _SetParameters(ballTextureNode, [
                 ('filename', Sdf.ValueTypeNames.String, texPath),