Fix a couple of build issues and a broken import from latest PR

LumaPictures · Aug 16, 2018 · 35b01ea · 35b01ea
1 parent 9d87cad
commit 35b01ea
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/pxr/usdQt/CMakeLists.txt b/pxr/usdQt/CMakeLists.txt
@@ -13,7 +13,6 @@ if (INSTALL_PURE_PYTHON)
         hierarchyModel.py
         hooks.py
         layerModel.py
-        layers.py
         opinionModel.py
         opinionStackModel.py
         qtUtils.py
@@ -22,7 +21,6 @@ if (INSTALL_PURE_PYTHON)
         usdUtils.py
         valueDelegate.py
         valueWidgets.py
-        variantSets.py
     )
 else ()
     set(PYTHON_FILES

diff --git a/pxr/usdQtEditors/outliner.py b/pxr/usdQtEditors/outliner.py
@@ -35,7 +35,7 @@
 from pxr import Sdf, Tf, Usd
 from pxr.UsdQt.hierarchyModel import HierarchyBaseModel
 from pxr.UsdQt.hooks import UsdQtHooks
-from pxr.UsdQt.layers import LayerStackBaseModel
+from pxr.UsdQt.layerModel import LayerStackBaseModel
 from pxr.UsdQt.qtUtils import DARK_ORANGE, MenuAction, MenuSeparator, \
     MenuBuilder, ContextMenuMixin, MenuBarBuilder, CopyToClipboard
 from pxr.UsdQt.usdUtils import GetPrimVariants