tg/pr/maya_export_camera_shake

PixarAnimationStudios · Jan 17, 2018 · 4101efe · 4101efe
1 parent 1937009
commit 4101efe
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/third_party/maya/lib/usdMaya/MayaCameraWriter.cpp b/third_party/maya/lib/usdMaya/MayaCameraWriter.cpp
@@ -105,10 +105,12 @@ bool MayaCameraWriter::writeCameraAttrs(const UsdTimeCode &usdTime, UsdGeomCamer
         const double verticalAperture = PxrUsdMayaUtil::ConvertInchesToMM(
             camFn.verticalFilmAperture());
 
+        // Film offset and shake (when enabled) have the same effect on film back
         const double horizontalApertureOffset = PxrUsdMayaUtil::ConvertInchesToMM(
-            camFn.horizontalFilmOffset());
+            (camFn.shakeEnabled() ?
+             camFn.horizontalFilmOffset() + camFn.horizontalShake() : camFn.horizontalFilmOffset()));
         const double verticalApertureOffset = PxrUsdMayaUtil::ConvertInchesToMM(
-            camFn.verticalFilmOffset());
+            (camFn.shakeEnabled() ? camFn.verticalFilmOffset() + camFn.verticalShake() : camFn.verticalFilmOffset()));
 
         primSchema.GetHorizontalApertureAttr().Set(
             float(horizontalAperture), usdTime);