MAYA-95627 - Update to latest AL develop branch v0.29.4 + USD v18.11 (A…

…nimalLogic#28) * Some minor fixes related to merging discovered when trying to merge our 'dev-adsk' branch into 'develop'.
autodesk-forks · Nov 19, 2018 · 1ca311c · 1ca311c
1 parent 39559d0
commit 1ca311c
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -35,7 +35,7 @@ if(CMAKE_WANT_UFE_BUILD)
     string(REPLACE "." ";" UFE_VERSION_LIST ${UFE_VERSION})
     list(GET UFE_VERSION_LIST 0 UFE_MAJOR_VERSION)
     list(GET UFE_VERSION_LIST 1 UFE_MINOR_VERSION)
-    list(GET UFE_VERSION_LIST 1 UFE_PATCH_LEVEL)
+    list(GET UFE_VERSION_LIST 2 UFE_PATCH_LEVEL)
     find_package(UFE REQUIRED)
     include_directories(${UFE_INCLUDE_DIR})
 endif()

diff --git a/schemas/AL/usd/schemas/plugInfo.json.in b/schemas/AL/usd/schemas/plugInfo.json.in
@@ -85,7 +85,7 @@
                     }
                 }
             }, 
-            "LibraryPath": "${LIBRARY_LOCATION}/@CMAKE_SHARED_LIBRARY_PREFIX@@SCHEMAS_PACKAGE@@CMAKE_SHARED_LIBRARY_SUFFIX@", 
+            "LibraryPath": "${SCHEMAS_LIBRARY_DIR}/@CMAKE_SHARED_LIBRARY_PREFIX@@SCHEMAS_PACKAGE@@CMAKE_SHARED_LIBRARY_SUFFIX@", 
             "Name": "@SCHEMAS_PACKAGE@", 
             "ResourcePath": "resources", 
             "Root": "..", 

diff --git a/translators/Camera.h b/translators/Camera.h
@@ -54,7 +54,6 @@ class Camera
   AL_USDMAYA_PUBLIC virtual void writePrim(UsdPrim &prim, MDagPath dagPath, const ExporterParams& params);
 
 private:
-  MStatus updateAttributes(MObject to, UsdGeomCamera& usdCamera);
   static MObject m_orthographic;
   static MObject m_horizontalFilmAperture;
   static MObject m_verticalFilmAperture;