@@ -99,2 +99,4 @@
   InstancerDataMap instancers_;
   std::unique_ptr<WorldData> world_data_;
+
+  short shading_flag_;

@@ -78,3 +78,2 @@
     Main *main = CTX_data_main(context);
-    file_path.reserve(FILE_MAX);
-    BKE_image_user_file_path_ex(main, iuser, image, file_path.data(), false, true);
+    BKE_image_user_file_path_ex(main, iuser, image, file_path, false, true);

@@ -32,2 +32,4 @@
 
   pxr::GfMatrix4d transform;
+  float rotation;
+  float intensity;

@@ -642,0 +683,4 @@
+{
+  bool ret = false;
+  if (view3d) {
+    if (shading_settings.shading_flag != view3d->shading.flag ||

@@ -40,0 +42,4 @@
+    short shading_flag;
+    std::string lookdev_light;
+    float rotation;
+    float intensity;

@@ -94,2 +103,4 @@
   void remove_unused_objects();
   void update_visibility();
+  bool set_light_shading_settings(View3D const *view3d);
+  bool set_world_shading_settings(View3D const *view3d);

@@ -100,4 +111,10 @@ class BlenderSceneDelegate : public pxr::HdSceneDelegate {
   std::unique_ptr<WorldData> world_data_;
 };
 
+#define LOOK_DEV_STUDIO_LIGHT_ENABLED(v3d) \

@@ -272,6 +272,11 @@ void InstancerData::check_remove(Set<std::string> &available_objects)
 
   light_instances_.remove_if([&](auto item) {
     bool res = !available_objects.contains(item.key.GetName());
+    if (!V3D_USES_SCENE_LIGHTS(scene_delegate_->view3d) &&

@@ -354,2 +359,4 @@
   LISTBASE_FOREACH (DupliObject *, dupli, lb) {
     Object *ob = dupli->ob;
+    if (scene_delegate_->view3d && !V3D_USES_SCENE_LIGHTS(scene_delegate_->view3d) &&
+        ob->type == OB_LAMP)

@@ -12,10 +12,13 @@
 #include <pxr/usd/usdLux/tokens.h>
 
 #include "BKE_context.h"
+#include "DEG_depsgraph_query.h"

@@ -47,3 +52,2 @@
   data_[pxr::UsdLuxTokens->orientToStageUpAxis] = true;
-
-  if (world->use_nodes) {
+  eEvaluationMode deg_mode = DEG_get_mode(scene_delegate_->depsgraph);

@@ -520,3 +537,2 @@
               std::bitset<3>(BKE_object_visibility(object, deg_mode)).to_string().c_str());
-    update_objects(object);
-    update_instancers(object);
+    if (only_lights) {

@@ -566,6 +591,9 @@ void BlenderSceneDelegate::remove_unused_objects()
   /* Remove unused objects */
   objects_.remove_if([&](auto item) {
     bool ret = !available_objects.contains(item.key.GetName());
+    if (!shading_settings.use_scene_lights && ((Object *)item.value->id)->type == OB_LAMP) {

@@ -642,0 +681,4 @@
+
+bool BlenderSceneDelegate::set_world_shading_settings()
+{
+  bool ret = false;

@@ -40,0 +44,4 @@
+    float studiolight_rotation;
+    float studiolight_intensity;
+
+    bool operator==(const ShadingSettings &other)

@@ -272,6 +272,11 @@ void InstancerData::check_remove(Set<std::string> &available_objects)
 
   light_instances_.remove_if([&](auto item) {
     bool res = !available_objects.contains(item.key.GetName());
+    if (!scene_delegate_->shading_settings.use_scene_lights &&

@@ -100,3 +120,1 @@
-    data_[pxr::HdLightTokens->intensity] = 1.0f;
-    data_[pxr::HdLightTokens->exposure] = world->exposure;
-    data_[pxr::HdLightTokens->color] = pxr::GfVec3f(world->horr, world->horg, world->horb);
+    if (scene_delegate_->view3d && !scene_delegate_->shading_settings.use_scene_world) {