Merge branch 'Autodesk:dev' into hsabri/fix_compiler_vs2022

Author: hamedsabri

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "lib/hydra-viewport-toolbox"]
+	path = lib/hydra-viewport-toolbox
+	url = https://github.com/Autodesk/hydra-viewport-toolbox.git

CMakeLists.txt

@@ -23,6 +23,7 @@ project(maya-hydra)
 option(BUILD_TESTS "Build tests." ON)
 option(BUILD_STRICT_MODE "Enforce all warnings as errors." ON)
 option(BUILD_SHARED_LIBS "Build libraries as shared or static." ON)
+option(ENABLE_VIEWPORT_TOOLBOX "Build MayaHydra with ViewportToolbox support." ON)
 option(CODE_COVERAGE "Build and collect code coverage info." OFF)
 
 if(APPLE)
@@ -91,7 +92,9 @@ include(cmake/flowViewport_version.info)
 set(FLOWVIEWPORT_VERSION "${FLOWVIEWPORT_MAJOR_VERSION}.${FLOWVIEWPORT_MINOR_VERSION}.${FLOWVIEWPORT_PATCH_LEVEL}")
 
 set(DEFAULT_PYTHON_3_VERSION 3.10)
-if (MAYA_APP_VERSION VERSION_GREATER 2024)
+if (MAYA_APP_VERSION VERSION_GREATER 2026)
+    set(DEFAULT_PYTHON_3_VERSION 3.13)
+elseif (MAYA_APP_VERSION VERSION_GREATER 2024)
     set(DEFAULT_PYTHON_3_VERSION 3.11)
 endif()
 if (NOT BUILD_WITH_PYTHON_3_VERSION)
@@ -124,6 +127,10 @@ if (CMAKE_WANT_MATERIALX_BUILD)
 endif()
 include(cmake/usd.cmake)
 
+# Avoid re-invoking OpenUSD's pxrConfig.cmake from subprojects (e.g., hydra-viewport-toolbox)
+# which can lead to duplicate imported targets like TBB::tbb.
+set(pxr_FOUND TRUE)
+
 set(CONFIGURABLE_DECIMAL_STREAMING_AVAILABLE FALSE)
 if (DEFINED PXR_USD_LOCATION)
     file(GLOB_RECURSE STRING_UTILS_HEADER_PATH
@@ -148,6 +155,18 @@ else()
     message(STATUS "UFE not found.")
 endif()
 
+if (ENABLE_VIEWPORT_TOOLBOX)
+    set(VIEWPORTTOOLBOX_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/lib/hydra-viewport-toolbox/include")
+    set(VIEWPORTTOOLBOX_VIEWPORTTOOLBOX_LIB hvt)
+    # Note: The multi-configuration generators (e.g., VS) always append the build type to the output directories
+    if(GENERATOR_IS_MULTI_CONFIG)
+        set(VIEWPORTTOOLBOX_VIEWPORTTOOLBOX_DLL_PATH "${CMAKE_BINARY_DIR}/lib/hydra-viewport-toolbox/bin/${CMAKE_BUILD_TYPE}")
+    else()
+        set(VIEWPORTTOOLBOX_VIEWPORTTOOLBOX_DLL_PATH "${CMAKE_BINARY_DIR}/lib/hydra-viewport-toolbox/bin")
+    endif()
+    set(BUILD_WITH_VIEWPORT_TOOLBOX TRUE)
+endif()
+
 find_package(MayaUsd)
 if(MayaUsd_FOUND)
     message(STATUS "Building with MayaUsd.")
@@ -196,11 +215,6 @@ endif()
 #------------------------------------------------------------------------------
 include(cmake/compiler_config.cmake)
 
-#------------------------------------------------------------------------------
-# gulrak filesystem
-#------------------------------------------------------------------------------
-include(cmake/gulrak.cmake)
-
 #------------------------------------------------------------------------------
 # test
 #------------------------------------------------------------------------------

build.py

@@ -17,15 +17,17 @@
 
 from __future__ import print_function
 
-from distutils.spawn import find_executable
+try:
+   from shutil import which as find_executable
+except ImportError:
+   from distutils.spawn import find_executable
+
 from glob import glob
 
 import argparse
 import contextlib
 import codecs
 import datetime
-import distutils
-import distutils.util
 import multiprocessing
 import os
 import platform
@@ -77,6 +79,22 @@ def PrintError(error):
         traceback.print_exc()
     print("ERROR:", error)
 
+def strtobool(val):
+    """Convert a string representation of truth to bool.
+
+    Accepted true values are: 'y', 'yes', 't', 'true', 'on', '1'
+    Accepted false values are: 'n', 'no', 'f', 'false', 'off', '0'
+    Case-insensitive; raises ValueError for invalid values.
+    """
+    if isinstance(val, bool):
+        return val
+    v = str(val).strip().lower()
+    if v in ("y", "yes", "t", "true", "on", "1"):
+        return True
+    if v in ("n", "no", "f", "false", "off", "0"):
+        return False
+    raise ValueError("Invalid truth value: {0}".format(val))
+
 def Python3():
     return sys.version_info.major == 3
 ############################################################
@@ -662,7 +680,7 @@ def Package(context):
                           "(default: # of processors [{0}])"
                           .format(GetCPUCount())))
 
-parser.add_argument("--redirect-outstream-file", type=distutils.util.strtobool, dest="redirect_outstream_file", default=True,
+parser.add_argument("--redirect-outstream-file", type=strtobool, dest="redirect_outstream_file", default=True,
                     help="Redirect output stream to a file. Set this flag to false to redirect output stream to console instead.")
 
 args = parser.parse_args()

cmake/compiler_config.cmake

@@ -223,5 +223,6 @@ function(mayaHydra_compile_config TARGET)
             TBB_SUPPRESS_DEPRECATED_MESSAGES # Remove TBB deprecation warnings
             BOOST_ALL_NO_LIB # Avoid Boost autolinking libraries
             $<$<BOOL:${CONFIGURABLE_DECIMAL_STREAMING_AVAILABLE}>:CONFIGURABLE_DECIMAL_STREAMING_AVAILABLE>
+            $<$<BOOL:${BUILD_WITH_VIEWPORT_TOOLBOX}>:VIEWPORT_TOOLBOX>
     )
 endfunction()

cmake/gulrak.cmake

@@ -182,7 +182,7 @@ function(mayaUsd_add_test test_name)
     if(PREFIX_WORKING_DIRECTORY)
         set(WORKING_DIR ${PREFIX_WORKING_DIRECTORY})
     else()
-        set(WORKING_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+        set(WORKING_DIR ${CMAKE_CURRENT_BINARY_DIR})
     endif()
 
     # --------------
@@ -288,21 +288,55 @@ finally:
     else()
         list(APPEND ALL_PATH_VARS
             LD_LIBRARY_PATH
+            IDIFF_LD_LIBRARY_PATH
+            LD_PRELOAD
         )
     endif()
 
     # Set initial empty values for all path vars
+    # NOTE - we prefix varnames with "MAYAUSD_VARNAME_" just to make collision
+    # with some existing var less likely
+
     foreach(pathvar ${ALL_PATH_VARS})
         set(MAYAUSD_VARNAME_${pathvar})
     endforeach()
 
     if(IS_WINDOWS)
         list(APPEND MAYAUSD_VARNAME_PATH "${CMAKE_INSTALL_PREFIX}/lib/gtest")
         list(APPEND MAYAUSD_VARNAME_PATH "${MAYA_LOCATION}/bin")
+    else()
+        # Set up environment for idiff execution
+        set(MAYAUSD_VARNAME_LD_LIBRARY_PATH "${ADDITIONAL_LD_LIBRARY_PATH}")
+    
+        # LD_LIBRARY_PATH needs to be set for the idiff executable because its 
+        # RPATH is absolute rather than relative to ORIGIN, meaning the RPATH 
+        # points to the absolute path on the machine where idiff was built.
+        # This absence of relative paths for RPATH comes from OpenImageIO.
+        # We introduce a second workaround to avoid Maya using usd's libpng, 
+        # because both use incompatible versions of libpng. This is done by 
+        # setting LD_LIBRARY_PATH to IDIFF_LD_LIBRARY_PATH only when we run 
+        # idiff using Python's subprocess module.
+        set(MAYAUSD_VARNAME_IDIFF_LD_LIBRARY_PATH "${ADDITIONAL_LD_LIBRARY_PATH}:${PXR_USD_LOCATION}/lib64:${PXR_USD_LOCATION}/lib")
+    
+        # Maya uses a very old version of GLEW, so we need support for
+        # pre-loading a newer version from elsewhere.
+        set(MAYAUSD_VARNAME_LD_PRELOAD "${ADDITIONAL_LD_PRELOAD}")
     endif()
 
-    # NOTE - we prefix varnames with "MAYAUSD_VARNAME_" just to make collision
-    # with some existing var less likely
+    # Set up environment for overall test and Maya defaults. 
+    set(ALL_TEST_VARS
+        IMAGE_DIFF_TOOL
+        MAYA_HAS_RENDER_ITEM_CULL_MODE_API
+    )
+
+    set(MAYAUSD_VARNAME_IMAGE_DIFF_TOOL "${IMAGE_DIFF_TOOL}")
+
+    set(MAYAUSD_VARNAME_MAYA_HAS_RENDER_ITEM_CULL_MODE_API "${MAYA_HAS_RENDER_ITEM_CULL_MODE_API}")
+
+    foreach(testvar ${ALL_TEST_VARS})
+        set_property(TEST "${test_name}" APPEND PROPERTY ENVIRONMENT
+            "${testvar}=${MAYAUSD_VARNAME_${testvar}}")
+    endforeach()
 
     # Emulate what the module files for mayaHydra and mayaUsdPlugin would do.
 

cmake/test.cmake

@@ -1,5 +1,33 @@
 # Changelog
 
+## [v0.7.3] - 2025-10-01
+
+**Added:**
+* Support Transform Selection Highlighting on Native Instances [#296](https://github.com/Autodesk/maya-hydra/pull/296)
+* Enable `cameraAdapter` when `MAYA_HYDRA_USE_MESH_ADAPTER` is 0 [#297](https://github.com/Autodesk/maya-hydra/pull/297)
+* Delete Ancestor Prim Folders from Hydra Scene Browser [#295](https://github.com/Autodesk/maya-hydra/pull/295)
+* Hydra Primitive Scene Stats [#294](https://github.com/Autodesk/maya-hydra/pull/294)
+* Dual hierarchy implementation [#308](https://github.com/Autodesk/maya-hydra/pull/308)
+
+**Fixed:**
+* Change erroneous USD version code switch from 2403 to 2405 [#300](https://github.com/Autodesk/maya-hydra/pull/300)
+* Fix camera translation to Hydra [#301](https://github.com/Autodesk/maya-hydra/pull/301)
+* Fix issue when using new Qt [#299](https://github.com/Autodesk/maya-hydra/pull/299)
+* Fix minor details [#292](https://github.com/Autodesk/maya-hydra/pull/292)
+
+**Build / Dependencies:**
+* Update minimum CMake version [#312](https://github.com/Autodesk/maya-hydra/pull/312)
+* Bump MayaHydra version [#314](https://github.com/Autodesk/maya-hydra/pull/314)
+* Update to next development version [#290](https://github.com/Autodesk/maya-hydra/pull/290)
+
+**Documentation:**
+* Update build docs [#313](https://github.com/Autodesk/maya-hydra/pull/313)
+* Remove dead link [#293](https://github.com/Autodesk/maya-hydra/pull/293)
+
+**Tests:**
+* Add NURBS curve test [#311](https://github.com/Autodesk/maya-hydra/pull/311)
+* Extend transform tests [#309](https://github.com/Autodesk/maya-hydra/pull/309)
+
 ## [v0.7.2] - 2025-08-05
 
 **Build:**

doc/CHANGELOG.md

@@ -13,7 +13,7 @@ Before building the project, consult the following table to ensure you use the r
 | Operating System | Windows 10 <br> Windows 11 | High Sierra (10.13)<br>Mojave (10.14)<br>Catalina (10.15)<br>Big Sur (11.2.x) | Rocky Linux 8.6 / Linux® Red Hat® Enterprise 8.6 WS |
 | Compiler Requirement| Maya 2026 (VS 2022)<br>Maya PR (VS 2022) | Maya 2026 (Xcode 13.4 or higher)<br>Maya PR (Xcode 13.4 or higher) | Maya 2026 (gcc 11.2.1)<br>Maya PR (gcc 11.2.1) |
 | CMake Version (min/max) | 3.21...3.30 | 3.21...3.30 | 3.21...3.30 |
-| Python | 3.11.4, 3.11.9 | 3.11.4, 3.11.9 | 3.11.4, 3.11.9 |
+| Python | 3.11.4, 3.13.7 | 3.11.4, 3.13.7 | 3.11.4, 3.13.7 |
 | Python Packages | PyYAML, PySide, PyOpenGL | PyYAML, PySide2, PyOpenGL | PyYAML, PySide, PyOpenGL |
 | Build generator | Visual Studio, Ninja (Recommended) | XCode, Ninja (Recommended) | Ninja (Recommended) |
 | Command processor | x64 Native Tools Command Prompt for VS 2022 | bash | bash |
@@ -112,9 +112,9 @@ PYTHON_LIBRARIES=<maya-location>/lib/libpython<python-version>.so (e.g. : <maya-
 OSX:
 Python_EXECUTABLE=<maya-location>/Maya.app/Contents/bin/mayapy
 PYTHON_INCLUDE_DIR=<maya-location>/Maya.app/Contents/Frameworks/Python.framework/Versions/<python-version>/include/python<python-version>
-(e.g. <maya-location>/Maya.app/Contents/Frameworks/Python.framework/Versions/3.11/include/python3.11)
+(e.g. <maya-location>/Maya.app/Contents/Frameworks/Python.framework/Versions/3.13/include/python3.13)
 PYTHON_LIBRARIES=<maya-location>/Maya.app/Contents/Frameworks/Python.framework/Versions/<python-version>/lib/libpython<python-version>.dylib
-(e.g. : <maya-location>/Maya.app/Contents/Frameworks/Python.framework/Versions/3.11/lib/libpython3.11.dylib)
+(e.g. : <maya-location>/Maya.app/Contents/Frameworks/Python.framework/Versions/3.13/lib/libpython3.13.dylib)
 
 Windows:
 Python_EXECUTABLE=<maya-location>\bin\mayapy.exe

doc/build.md

@@ -27,6 +27,7 @@ If OpenUSD was not built with the same version of Python as the one used in your
 | 2024                 | 3.10.8           |
 | 2025                 | 3.11.4           |
 | 2026                 | 3.11.9           |
+| PR                 | 3.13.3           |
 
 So for Maya 2024, we need to rebuild OpenUSD with Python 3.10.8.<br>
 To do so, you need to clone the OpenUSD repository and checkout the version used by MayaUsd and MayaHydra which is [v24.11-MayaUsd-Public](https://github.com/autodesk-forks/USD/tree/v24.11-MayaUsd-Public).<br>

doc/legacyBuilds.md

@@ -87,7 +87,7 @@ classDiagram
     -_rendererPlugin: HdRendererPlugin*
     -_taskController: HdxTaskController*
     -_renderDelegate: HdPluginRenderDelegateUniqueHandle
-    -_renderIndexProxy: std::unique_ptr<Fvp::RenderIndexProxy>
+    -_dataProducerMergingSceneIndexProxy: std::shared_ptr<Fvp::DataProducerMergingSceneIndexProxy>
     -_renderIndex: HdRenderIndex*
     -_fvpSelectionTracker: Fvp::SelectionTrackerSharedPtr
     -_selectionSceneIndex: Fvp::SelectionSceneIndexRefPtr