Merge pull request #1212 from Autodesk/fowlert/MAYA-109952/nullptr_check

null and anonymous layer checks
Autodesk · Feb 26, 2021 · 02fdccd · 02fdccd
2 parents 1317986 + bb01434
commit 02fdccd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/mayaUsd/nodes/layerManager.cpp b/lib/mayaUsd/nodes/layerManager.cpp
@@ -504,7 +504,9 @@ bool LayerDatabase::saveUsdToUsdFiles()
 
             SdfLayerHandleVector allLayers = stage->GetLayerStack(false);
             for (auto layer : allLayers) {
-                layer->Save();
+                if (layer->PermissionToSave()) {
+                    layer->Save();
+                }
             }
         }
     }

diff --git a/lib/mayaUsd/utils/utilSerialization.cpp b/lib/mayaUsd/utils/utilSerialization.cpp
@@ -212,7 +212,7 @@ SdfLayerRefPtr UsdMayaSerialization::saveAnonymousLayer(
 
     SdfLayerRefPtr newLayer = SdfLayer::FindOrOpen(path);
 
-    if (parentLayer) {
+    if (newLayer && parentLayer) {
         parentLayer->GetSubLayerPaths().Replace(
             anonLayer->GetIdentifier(), newLayer->GetIdentifier());
     }