Autodesk · debloip-adsk · Jan 26, 2026 · Jan 20, 2026 · Jan 21, 2026 · Jan 21, 2026
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -23,7 +23,6 @@ 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)
@@ -155,17 +154,14 @@ 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
-    get_cmake_property(GENERATOR_IS_MULTI_CONFIG_VAR GENERATOR_IS_MULTI_CONFIG)
-    if(GENERATOR_IS_MULTI_CONFIG_VAR)
-        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)
+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
+get_cmake_property(GENERATOR_IS_MULTI_CONFIG_VAR GENERATOR_IS_MULTI_CONFIG)
+if(GENERATOR_IS_MULTI_CONFIG_VAR)
+    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()
 
 find_package(MayaUsd)

diff --git a/cmake/compiler_config.cmake b/cmake/compiler_config.cmake
@@ -223,6 +223,5 @@ 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()
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -1,15 +1,11 @@
 add_subdirectory(mayaHydra)
 add_subdirectory(flowViewport)
 
-if (ENABLE_VIEWPORT_TOOLBOX)
-    # Use vanilla OpenUSD
-    set(ENABLE_ADSK_OPENUSD_PENDING OFF)
-    set(OPENUSD_INSTALL_PATH "${PXR_USD_LOCATION}")
-
-    set(ENABLE_DRAW_ORDER OFF)
-
-    # Disable tests for HVT.
-    set(ENABLE_TESTS OFF)
-
-    add_subdirectory(hydra-viewport-toolbox)
-endif()
+# HVT setup
+# Use vanilla OpenUSD
+set(ENABLE_ADSK_OPENUSD_PENDING OFF)
+set(OPENUSD_INSTALL_PATH "${PXR_USD_LOCATION}")
+set(ENABLE_DRAW_ORDER OFF)
+# Disable tests for HVT.
+set(ENABLE_TESTS OFF)
+add_subdirectory(hydra-viewport-toolbox)
diff --git a/lib/flowViewport/CMakeLists.txt b/lib/flowViewport/CMakeLists.txt
@@ -38,7 +38,7 @@ target_include_directories(${TARGET_NAME}
         ${PXR_INCLUDE_DIRS}
         ${CMAKE_BINARY_DIR}/include
         ${UFE_INCLUDE_DIR}
-        $<$<BOOL:${BUILD_WITH_VIEWPORT_TOOLBOX}>:${VIEWPORTTOOLBOX_INCLUDE_DIR}>
+        ${VIEWPORTTOOLBOX_INCLUDE_DIR}
 )
 
 # -----------------------------------------------------------------------------
@@ -63,8 +63,8 @@ target_link_libraries(${TARGET_NAME}
         sdf
         usdImaging
         ${UFE_LIBRARY}
-        $<$<BOOL:${BUILD_WITH_VIEWPORT_TOOLBOX}>:${VIEWPORTTOOLBOX_VIEWPORTTOOLBOX_LIB}>
-        $<$<BOOL:${BUILD_WITH_VIEWPORT_TOOLBOX}>:${VIEWPORTTOOLBOX_VISUALSTYLES_LIB}>
+        ${VIEWPORTTOOLBOX_VIEWPORTTOOLBOX_LIB}
+        ${VIEWPORTTOOLBOX_VISUALSTYLES_LIB}
     PRIVATE
         ar
         gf
@@ -110,9 +110,6 @@ if(IS_WINDOWS)
         install(FILES $<TARGET_PDB_FILE:${TARGET_NAME}> 
                 DESTINATION ${CMAKE_INSTALL_PREFIX}/lib OPTIONAL)
     endif()
-endif()
-
-if (BUILD_WITH_VIEWPORT_TOOLBOX AND IS_WINDOWS)
     install(
         FILES 
             ${VIEWPORTTOOLBOX_VIEWPORTTOOLBOX_DLL_PATH}/hvt.dll

diff --git a/lib/flowViewport/fvpFramePassData.cpp b/lib/flowViewport/fvpFramePassData.cpp
@@ -17,8 +17,6 @@
 #include "fvpFramePassData.h"
 #include "flowViewport/sceneIndex/fvpPassFilteringSceneIndex.h"
 
-#ifdef VIEWPORT_TOOLBOX
-
 PXR_NAMESPACE_USING_DIRECTIVE
 
 namespace FVP_NS_DEF {
@@ -33,4 +31,3 @@ void FramePassData::DirtyPrimsFromPurposeRenderTag(const PXR_NS::TfToken purpose
 }
 
 }; // namespace FVP_NS_DEF
-#endif
diff --git a/lib/flowViewport/fvpFramePassData.h b/lib/flowViewport/fvpFramePassData.h
@@ -18,8 +18,6 @@
 
 #include "flowViewport/api.h"
 
-#ifdef VIEWPORT_TOOLBOX
-
 #include <pxr/pxr.h>
 #include <pxr/base/tf/token.h>
 #include <pxr/usd/sdf/path.h>
@@ -101,6 +99,4 @@ using FramePassDataPtrVector = std::vector<FramePassDataPtr>;
 
 }; // namespace FVP_NS_DEF
 
-#endif // VIEWPORT_TOOLBOX
-
 #endif // FLOW_VIEWPORT_FRAME_PASS_FILTERING_DATA_H
diff --git a/lib/flowViewport/imageWriter/fvpRenderBufferWriter.cpp b/lib/flowViewport/imageWriter/fvpRenderBufferWriter.cpp
@@ -16,9 +16,7 @@
 
 #include <flowViewport/imageWriter/fvpRenderBufferWriter.h>
 
-#ifdef VIEWPORT_TOOLBOX
 #include <hvt/engine/framePass.h>
-#endif
 
 #include <pxr/imaging/hdSt/hioConversions.h>
 #include <pxr/imaging/hdx/taskController.h>
@@ -42,13 +40,8 @@ HdRenderBuffer* getRenderBuffer(
     const PXR_NS::TfToken& aovToken
 )
 {
-#ifdef VIEWPORT_TOOLBOX
     auto framePass = Fvp::ImageBufferWriter::GetPtr<hvt::FramePass>(args, "framePass");
     return framePass ? framePass->GetRenderBuffer(aovToken) : nullptr;
-#else
-    auto taskController = Fvp::ImageBufferWriter::GetPtr<HdxTaskController>(args, "taskController");
-    return getRenderBuffer(taskController, aovToken);
-#endif
 }
 
 }

diff --git a/lib/flowViewport/imageWriter/fvpTextureBufferWriter.cpp b/lib/flowViewport/imageWriter/fvpTextureBufferWriter.cpp
@@ -16,9 +16,7 @@
 
 #include <flowViewport/imageWriter/fvpTextureBufferWriter.h>
 
-#ifdef VIEWPORT_TOOLBOX
 #include <hvt/engine/framePass.h>
-#endif
 
 #include <pxr/imaging/hd/engine.h>
 #include <pxr/imaging/hdx/types.h>
@@ -47,13 +45,8 @@ HgiTextureHandle getTextureHandle(
     const TfToken&      aovToken
 )
 {
-#ifdef VIEWPORT_TOOLBOX
     auto framePass = Fvp::ImageBufferWriter::GetPtr<hvt::FramePass>(args, "framePass");
     return framePass ? framePass->GetRenderTexture(aovToken) : HgiTextureHandle();
-#else
-    auto engine = Fvp::ImageBufferWriter::GetPtr<HdEngine>(args, "engine");
-    return getTextureHandle(engine, aovToken);
-#endif
 }
 
 }

diff --git a/lib/flowViewport/sceneIndex/fvpPassFilteringSceneIndex.cpp b/lib/flowViewport/sceneIndex/fvpPassFilteringSceneIndex.cpp
@@ -13,8 +13,6 @@
 // limitations under the License.
 //
 
-#ifdef VIEWPORT_TOOLBOX
-
 #include "fvpPassFilteringSceneIndex.h"
 #include "flowViewport/fvpUtils.h"
 
@@ -347,5 +345,3 @@ void PassFilteringSceneIndex::_PrimsDirtied(
 }
 
 } // namespace FVP_NS_DEF
-
-#endif // VIEWPORT_TOOLBOX
diff --git a/lib/flowViewport/sceneIndex/fvpPassFilteringSceneIndex.h b/lib/flowViewport/sceneIndex/fvpPassFilteringSceneIndex.h
@@ -15,8 +15,6 @@
 #ifndef FVP_PASS_FILTERING_SCENE_INDEX_H
 #define FVP_PASS_FILTERING_SCENE_INDEX_H
 
-#ifdef VIEWPORT_TOOLBOX
-
 #include "flowViewport/api.h"
 #include "flowViewport/sceneIndex/fvpSceneIndexUtils.h"
 #include "flowViewport/fvpFramePassData.h"
@@ -119,6 +117,4 @@ class PassFilteringSceneIndex
 
 } // namespace FVP_NS_DEF
 
-#endif // VIEWPORT_TOOLBOX
-
 #endif // FVP_PASS_FILTERING_SCENE_INDEX_H
diff --git a/lib/flowViewport/selection/CMakeLists.txt b/lib/flowViewport/selection/CMakeLists.txt
@@ -5,7 +5,6 @@ target_sources(${TARGET_NAME}
     PRIVATE
     fvpSelection.cpp
     fvpSelectionFwd.cpp
-    fvpSelectionTask.cpp
     fvpSelectionTracker.cpp
     fvpSelectionTypes.cpp
     fvpPathMapper.cpp
@@ -18,7 +17,6 @@ target_sources(${TARGET_NAME}
 set(HEADERS
     fvpSelection.h
     fvpSelectionFwd.h
-    fvpSelectionTask.h
     fvpSelectionTracker.h
     fvpSelectionTypes.h
     fvpPathMapper.h

diff --git a/lib/flowViewport/selection/fvpSelectionTask.cpp b/lib/flowViewport/selection/fvpSelectionTask.cpp