Animated camera parameters were not being correctly pull by the rende…

…r delegate. (Internal change: 2012318)
Autodesk · Oct 14, 2019 · 1d08054 · 1d08054
1 parent 288614f
commit 1d08054
Showing 1 changed file with 14 additions and 16 deletions.
diff --git a/pxr/usdImaging/lib/usdImaging/delegate.cpp b/pxr/usdImaging/lib/usdImaging/delegate.cpp
@@ -2923,23 +2923,21 @@ UsdImagingDelegate::GetCameraParamValue(SdfPath const &id,
 
     SdfPath cachePath = ConvertIndexPathToCachePath(id);
     VtValue value;
+    HdDirtyBits dirtyBit = HdCamera::Clean;
+    if (paramName == HdCameraTokens->worldToViewMatrix) {
+        dirtyBit = HdCamera::DirtyViewMatrix;
+    } else if (paramName == HdCameraTokens->projectionMatrix) {
+        dirtyBit = HdCamera::DirtyProjMatrix;
+    } else if (paramName == HdCameraTokens->clipPlanes) {
+        dirtyBit = HdCamera::DirtyClipPlanes;
+    } else {
+        dirtyBit = HdCamera::DirtyParams;
+    }
+
+    _UpdateSingleValue(cachePath, dirtyBit);
     if (!_valueCache.FindCameraParam(cachePath, paramName, &value)) {
-        HdDirtyBits dirtyBit = HdCamera::Clean;
-        if (paramName == HdCameraTokens->worldToViewMatrix) {
-            dirtyBit = HdCamera::DirtyViewMatrix;
-        } else if (paramName == HdCameraTokens->projectionMatrix) {
-            dirtyBit = HdCamera::DirtyProjMatrix;
-        } else if (paramName == HdCameraTokens->clipPlanes) {
-            dirtyBit = HdCamera::DirtyClipPlanes;
-        } else {
-            dirtyBit = HdCamera::DirtyParams;
-        }
-
-        _UpdateSingleValue(cachePath, dirtyBit);
-        if (!_valueCache.FindCameraParam(cachePath, paramName, &value)) {
-            // Fallback to USD attributes.
-            value = _GetUsdPrimAttribute(cachePath, paramName);
-        }
+        // Fallback to USD attributes.
+        value = _GetUsdPrimAttribute(cachePath, paramName);
     }
     return value;
 }