Merge branch 'PixarAnimationStudios:dev' into dev

Author: johnnynunez

cmake/defaults/msvcdefaults.cmake

@@ -9,7 +9,7 @@
 set(_PXR_CXX_FLAGS "${_PXR_CXX_FLAGS} /EHsc")
 
 # Standards compliant.
-set(_PXR_CXX_FLAGS "${_PXR_CXX_FLAGS} /Zc:rvalueCast /Zc:strictStrings")
+set(_PXR_CXX_FLAGS "${_PXR_CXX_FLAGS} /permissive-")
 
 # Visual Studio sets the value of __cplusplus to 199711L regardless of
 # the C++ standard actually being used, unless /Zc:__cplusplus is enabled.

cmake/macros/Public.cmake

@@ -959,6 +959,15 @@ function(pxr_register_test TEST_NAME)
     # TF_FATAL_VERIFY where desired.
     set(testWrapperCmd ${testWrapperCmd} --env-var=TF_FATAL_VERIFY=1)
 
+    # Allow env vars to be set via a global variable to make it easier
+    # to affect a set of tests (e.g., all tests in a library). Set
+    # this first to allow tests to override these env vars.
+    if (PXR_TEST_ENV_VARS)
+        foreach(env ${PXR_TEST_ENV_VARS})
+            set(testWrapperCmd ${testWrapperCmd} --env-var=${env})
+        endforeach()
+    endif()
+
     if (bt_ENV)
         foreach(env ${bt_ENV})
             set(testWrapperCmd ${testWrapperCmd} --env-var=${env})

docs/doxygen/developer_guides.dox

@@ -11,7 +11,7 @@
 <b>Hydra Guides</b>
 
 - \subpage Page_Hydra_Getting_Started_Guide
-- \subpage Page_Hydra_Scene_Browser
+- \subpage Page_Hydra_Scene_Debugger
 - \subpage Page_Hydra_Prim_Schemas
 
 <b>MaterialX Guides</b>

extras/imaging/docs/CMakeLists.txt

@@ -4,7 +4,7 @@ set(PXR_PACKAGE extras_imaging_docs)
 pxr_docs_only_dir(${PXR_PACKAGE}
     DOXYGEN_FILES
         hydra_getting_started_guide.dox
-        hydra_scene_browser.dox
+        hydra_scene_debugger.dox
         hydra_prim_schemas.dox
         examples_hydra_getting_started.cpp
         app_renderer_filters.png
@@ -17,7 +17,7 @@ pxr_docs_only_dir(${PXR_PACKAGE}
         scene_index_adapters.png
         scene_index_filter.png
         usdimagingstagesceneindex_filters.png
-        hydra_scene_browser_usdview.png
-        hydra_scene_browser_columns.png
-        hydra_scene_browser_filters.png        
+        hydra_scene_debugger_usdview.png
+        hydra_scene_debugger_columns.png
+        hydra_scene_debugger_filters.png        
 )

extras/imaging/docs/hydra_getting_started_guide.dox

@@ -50,7 +50,7 @@ querying the USD prim hierarchy. Finally, it implements \ref HdSceneIndexBase::G
 by returning the appropriate data for the prim in question (transform, geometric 
 data, etc. as appropriate).
 
-Consumers (such as renderers, the Hydra scene browser, etc) that want to receive 
+Consumers (such as renderers, the Hydra Scene Debugger, etc) that want to receive 
 notifications from a scene index can subclass the HdSceneIndexObserver interface.
 
 \snippet examples_hydra_getting_started.cpp HdSceneIndexObserverExcerpt
@@ -215,7 +215,7 @@ See \ref Hydra_Getting_Started_App_With_Filters for additional illustrative
 examples of scene index filters.
 
 Hydra provides a way to visualize scene data and filters using the 
-\ref Page_Hydra_Scene_Browser, available in tools like usdview. You can also 
+\ref Page_Hydra_Scene_Debugger, available in tools like usdview. You can also 
 add this to your Hydra-enabled application.
 
 \section Hydra_Getting_Started_Scene_Data Transporting Scene Data with Scene Indexes
@@ -512,7 +512,7 @@ settings) into different threading models if needed.
 Although there are benefits to using the scene index API from 
 end-to-end (for performance, flexibility, configurability), it's not required if
 you just want to get started with the 
-\ref Page_Hydra_Scene_Browser "Hydra Scene Browser" or the Application or 
+\ref Page_Hydra_Scene_Debugger "Hydra Scene Debugger" or the Application or 
 Renderer Scene Index Filters. Internally, Hydra is using the Scene Index 
 API, but to minimize impact we designed adapters to invisibly support existing 
 scene delegate implementations and existing render delegate implementations that 

extras/imaging/docs/hydra_scene_browser.dox renamed to extras/imaging/docs/hydra_scene_debugger.dox

@@ -1,24 +1,24 @@
 /*!
-\page Page_Hydra_Scene_Browser Hydra Scene Browser
+\page Page_Hydra_Scene_Debugger Hydra Scene Debugger
 
 A visual representation of the Hydra scene architecture can be very helpful
 for understanding or debugging your Hydra scene data. Usdview now has a window 
-called the **Hydra Scene Browser** that can be used for this purpose, and
+called the **Hydra Scene Debugger** that can be used for this purpose, and
 can also be integrated into your Hydra-enabled application.
 
-\image html hydra_scene_browser_usdview.png
+\image html hydra_scene_debugger_usdview.png
 
-The Hydra Scene Browser is a parallel to usdview's builtin browser, but shows 
+The Hydra Scene Debugger is a parallel to usdview's builtin browser, but shows 
 Hydra prims instead of USD prims. This lets users or developers inspect the data 
 Hydra renders from, after all of the load-time scene transforms have been 
 applied (like instancing resolution).
 
-The Hydra Scene Browser is bundled as a stand-alone Qt component and can be 
+The Hydra Scene Debugger is bundled as a stand-alone Qt component and can be 
 integrated into any Hydra-enabled application. See `pxr/imaging/hdui`, or the
 Python implementation in usdview in 
-`pxr/usdImaging/usdviewq/hydraSceneBrowser.py`.
+`pxr/usdImaging/usdviewq/hydraSceneDebugger.py`.
 
-The Hydra Scene Browser view of a given scene index has three columns:
+The Hydra Scene Debugger view of a given scene index has three columns:
 
 - A prim tree-view, roughly matching the USD prim view, modulo prims added by 
 procedurals or removed by instance aggregation, etc. This is populated by 
@@ -28,24 +28,24 @@ hierarchical. This is populated by getting the datasource for the prim with
 GetPrim(), and then calling GetNames() on containers.
 - A property value display for the selected property.
 
-\image html hydra_scene_browser_columns.png
+\image html hydra_scene_debugger_columns.png
 
 Everything is computed lazily. Names or values for a datasource are not pulled 
-until you select and expand it in the browser. The Hydra Scene Browser is also 
+until you select and expand it in the debugger. The Hydra Scene Debugger is also 
 a scene index observer, and receives 
 PrimsAdded/PrimsRemoved/PrimsDirtied/PrimsRenamed messages, which are logged 
 and displayable with the **Show Notice Logger** button.
 
 If the Hydra pipeline uses scene index filters to modify the view of the data, 
-the Hydra Scene Browser can look at the data provided by the filter as well as 
+the Hydra Scene Debugger can look at the data provided by the filter as well as 
 the data provided by the input scene, in order to debug the scene 
 transformation in question. The **Inputs** drop-down displays all of the 
 ancestor scene indexes of the selected scene index. An example scene index 
 filter pipeline might look like this:
 
-\image html hydra_scene_browser_filters.png
+\image html hydra_scene_debugger_filters.png
 
-The Hydra Scene Browser works for any Hydra release starting with 23.02, 
+The Hydra Scene Debugger works for any Hydra release starting with 23.02, 
 regardless of whether scene data is coming from a scene delegate or not. 
 Hydra converts between the representations internally as needed -- see 
 \ref Hydra_Getting_Started_Appendix_Scene_Index_Emulation for details.

extras/imaging/docs/hydra_scene_browser_columns.png renamed to extras/imaging/docs/hydra_scene_debugger_columns.png

@@ -21,6 +21,12 @@ if (${PXR_BUILD_IMAGING})
     endif()
 endif()
 
+if (PXR_BUILD_USD_TOOLS)
+    add_subdirectory(bin)
+else()
+    message(STATUS "Skipping commandline tools because PXR_BUILD_USD_TOOLS=OFF")
+endif()
+
 pxr_core_epilogue()
 
 export(PACKAGE pxr)