From 846dd7f823bebb6ae8dd3c65b4009c37df4e49c5 Mon Sep 17 00:00:00 2001
From: Paul Molodowitch <pmolodowitch@nvidia.com>
Date: Tue, 17 Dec 2024 17:40:11 -0800
Subject: [PATCH] rename tokens from exposureScale to linearExposureScale

...for both HdCameraTokens and HdCameraSchemaTokens
---
 pxr/imaging/hd/camera.cpp                      | 2 +-
 pxr/imaging/hd/camera.h                        | 2 +-
 pxr/imaging/hd/cameraSchema.cpp                | 6 +++---
 pxr/imaging/hd/cameraSchema.h                  | 2 +-
 pxr/imaging/hd/dataSourceLegacyPrim.cpp        | 2 +-
 pxr/usdImaging/usdImaging/cameraAdapter.cpp    | 2 +-
 pxr/usdImaging/usdImaging/dataSourceCamera.cpp | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pxr/imaging/hd/camera.cpp b/pxr/imaging/hd/camera.cpp
index 5fd8d5dd49..32bc8c5325 100644
--- a/pxr/imaging/hd/camera.cpp
+++ b/pxr/imaging/hd/camera.cpp
@@ -273,7 +273,7 @@ HdCamera::Sync(HdSceneDelegate * sceneDelegate,
 
         const VtValue vExposureScale =
             sceneDelegate->GetCameraParamValue(
-                id, HdCameraTokens->exposureScale);
+                id, HdCameraTokens->linearExposureScale);
         if (!vExposureScale.IsEmpty()) {
             _exposureScale = vExposureScale.Get<float>();
         }
diff --git a/pxr/imaging/hd/camera.h b/pxr/imaging/hd/camera.h
index eb9376be38..6c54f2cdbe 100644
--- a/pxr/imaging/hd/camera.h
+++ b/pxr/imaging/hd/camera.h
@@ -61,7 +61,7 @@ PXR_NAMESPACE_OPEN_SCOPE
     (exposureIso)                                                 \
     (exposureFStop)                                               \
     (exposureResponsivity)                                        \
-    (exposureScale)                                               \
+    (linearExposureScale)                                               \
                                                                   \
     /* how to match window with different aspect */               \
     (windowPolicy)                                                \
diff --git a/pxr/imaging/hd/cameraSchema.cpp b/pxr/imaging/hd/cameraSchema.cpp
index 5e2afbed16..e3c73b8710 100644
--- a/pxr/imaging/hd/cameraSchema.cpp
+++ b/pxr/imaging/hd/cameraSchema.cpp
@@ -155,7 +155,7 @@ HdFloatDataSourceHandle
 HdCameraSchema::GetExposureScale() const
 {
     return _GetTypedDataSource<HdFloatDataSource>(
-        HdCameraSchemaTokens->exposureScale);
+        HdCameraSchemaTokens->linearExposureScale);
 }
 
 HdBoolDataSourceHandle
@@ -312,7 +312,7 @@ HdCameraSchema::BuildRetained(
     }
 
     if (exposureScale) {
-        _names[_count] = HdCameraSchemaTokens->exposureScale;
+        _names[_count] = HdCameraSchemaTokens->linearExposureScale;
         _values[_count++] = exposureScale;
     }
 
@@ -660,7 +660,7 @@ HdCameraSchema::GetExposureScaleLocator()
 {
     static const HdDataSourceLocator locator =
         GetDefaultLocator().Append(
-            HdCameraSchemaTokens->exposureScale);
+            HdCameraSchemaTokens->linearExposureScale);
     return locator;
 }
 
diff --git a/pxr/imaging/hd/cameraSchema.h b/pxr/imaging/hd/cameraSchema.h
index 9193ab1bad..b5c4645aa7 100644
--- a/pxr/imaging/hd/cameraSchema.h
+++ b/pxr/imaging/hd/cameraSchema.h
@@ -54,7 +54,7 @@ PXR_NAMESPACE_OPEN_SCOPE
     (exposureIso) \
     (exposureFStop) \
     (exposureResponsivity) \
-    (exposureScale) \
+    (linearExposureScale) \
     (focusOn) \
     (dofAspect) \
     (splitDiopter) \
diff --git a/pxr/imaging/hd/dataSourceLegacyPrim.cpp b/pxr/imaging/hd/dataSourceLegacyPrim.cpp
index 3934b365b0..683f36d9ca 100644
--- a/pxr/imaging/hd/dataSourceLegacyPrim.cpp
+++ b/pxr/imaging/hd/dataSourceLegacyPrim.cpp
@@ -1047,7 +1047,7 @@ class Hd_DataSourceCamera : public HdContainerDataSource
             HdCameraSchemaTokens->exposureIso,
             HdCameraSchemaTokens->exposureFStop,
             HdCameraSchemaTokens->exposureResponsivity,
-            HdCameraSchemaTokens->exposureScale,
+            HdCameraSchemaTokens->linearExposureScale,
             HdCameraSchemaTokens->focusOn,
             HdCameraSchemaTokens->dofAspect,
             HdCameraSchemaTokens->splitDiopter,
diff --git a/pxr/usdImaging/usdImaging/cameraAdapter.cpp b/pxr/usdImaging/usdImaging/cameraAdapter.cpp
index 4b9b09ef5f..d3e04e0ac1 100644
--- a/pxr/usdImaging/usdImaging/cameraAdapter.cpp
+++ b/pxr/usdImaging/usdImaging/cameraAdapter.cpp
@@ -263,7 +263,7 @@ UsdImagingCameraAdapter::Get(UsdPrim const& prim,
         VtValue vExposureResponsivity;
         cam.GetExposureResponsivityAttr().Get(&vExposureResponsivity, time); // conversion n/a
         return vExposureResponsivity;
-    } else if (key == HdCameraTokens->exposureScale) {
+    } else if (key == HdCameraTokens->linearExposureScale) {
         // The computed linear exposure multiplier ratio
         return VtValue(cam.ComputeLinearExposureScale(time));
     }
diff --git a/pxr/usdImaging/usdImaging/dataSourceCamera.cpp b/pxr/usdImaging/usdImaging/dataSourceCamera.cpp
index 8d6e927567..593f9415dd 100644
--- a/pxr/usdImaging/usdImaging/dataSourceCamera.cpp
+++ b/pxr/usdImaging/usdImaging/dataSourceCamera.cpp
@@ -203,7 +203,7 @@ UsdImagingDataSourceCamera::GetNames()
 HdDataSourceBaseHandle
 UsdImagingDataSourceCamera::Get(const TfToken &name)
 {
-    if (name == HdCameraSchemaTokens->exposureScale) {
+    if (name == HdCameraSchemaTokens->linearExposureScale) {
         return _CameraExposureScaleDataSource::New(
             _sceneIndexPath, _usdCamera, _stageGlobals);
     }