Tremblp/hydra 1413/isolate select keep lighting

lib/flowViewport/sceneIndex/fvpIsolateSelectSceneIndex.cpp

@@ -28,6 +28,7 @@
 #include <pxr/imaging/hd/instancerTopologySchema.h>
 #include <pxr/imaging/hd/geomSubsetSchema.h>
 #include <pxr/imaging/hd/tokens.h>
+#include <pxr/imaging/hd/lightSchema.h>
 
 PXR_NAMESPACE_USING_DIRECTIVE
 
@@ -464,13 +465,20 @@ void IsolateSelectSceneIndex::_DirtyVisibilityRecursive(
     // relevant for materials
     auto prim = GetInputSceneIndex()->GetPrim(primPath);
     if (prim.primType == HdPrimTypeTokens->material) {
-      return;
+        return;
+    }
+
+    // If the prim is a light, early out: setting its visibility to false means
+    // it won't contribute lighting to the scene, not what we want.
+    auto lightSchema = HdLightSchema::GetFromParent(prim.dataSource);
+    if (lightSchema.IsDefined()) {
+        return;
     }
 
     // GeomSubset visibility must not be set (see GetPrim()), so no need to
     // dirty it.
     if (isGeomSubset(prim)) {
-      return;
+        return;
     }
 
     TF_DEBUG(FVP_ISOLATE_SELECT_SCENE_INDEX)

test/lib/mayaUsd/render/mayaToHydra/CMakeLists.txt

@@ -91,6 +91,7 @@ set(INTERACTIVE_TEST_SCRIPT_FILES
 # HYDRA-1245.
 if (MAYA_HAS_VIEW_SELECTED_OBJECT_API)
     list(APPEND INTERACTIVE_TEST_SCRIPT_FILES
+        testIsolateSelectWithUsdLighting.py|skipOnPlatform:osx # HYDRA-1127 : refinedWire not working on OSX
         cpp/testIsolateSelect.py
         cpp/testIsolateSelectSwitchToVP2.py
         cpp/testIsolateSelectMayaSelectionHighlighting.py

test/lib/mayaUsd/render/mayaToHydra/testIsolateSelectWithUsdLighting.py

@@ -0,0 +1,65 @@
+# Copyright 2024 Autodesk
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+import maya.cmds as cmds
+import maya.mel as mel
+import fixturesUtils
+import mayaUtils
+import mtohUtils
+
+def enableIsolateSelect(modelPanel):
+    # See comments in cpp/testIsolateSelect.py
+    cmds.setFocus(modelPanel)
+    mel.eval("enableIsolateSelect %s 1" % modelPanel)
+
+def disableIsolateSelect(modelPanel):
+    cmds.setFocus(modelPanel)
+    mel.eval("enableIsolateSelect %s 0" % modelPanel)
+
+class TestIsolateSelectWithUsdLighting(mtohUtils.MayaHydraBaseTestCase):
+    # MayaHydraBaseTestCase.setUpClass requirement.
+    _file = __file__
+
+    IMAGE_DIFF_FAIL_THRESHOLD = 0.01
+    IMAGE_DIFF_FAIL_PERCENT = 0.2
+
+    def test_IsolateSelectWithUsdLighting(self):
+        mayaUtils.openTestScene( 
+                "testIsolateSelectWithUsdLighting",
+                "mayaPlusUSDMeshesWithUSDLighting.ma")
+
+        # Bring the camera in closer.
+        self.setBasicCam(5)
+
+        cmds.refresh()
+
+        # Isolate select the USD sphere.
+        modelPanel = 'modelPanel4'
+        enableIsolateSelect(modelPanel)
+
+        cmds.select('|stage1|stageShape1,/pSphere1')
+        cmds.editor(modelPanel, edit=True, updateMainConnection=True)
+        cmds.isolateSelect(modelPanel, loadSelected=True)
+
+        cmds.refresh()
+
+        self.assertSnapshotClose("isolateSelectWithUsdLighting" + ".png", self.IMAGE_DIFF_FAIL_THRESHOLD, self.IMAGE_DIFF_FAIL_PERCENT)
+
+        # Disable the isolate selection.
+        disableIsolateSelect(modelPanel)
+
+        cmds.refresh()
+
+if __name__ == '__main__':
+    fixturesUtils.runTests(globals())