Integrating github/staging through commit 5f214be

2021-04-13 17:18:57 -07:00
parent 2a9dfb7a1d
commit 8469c9ca0a
904 changed files with 9289 additions and 7157 deletions
@@ -88,6 +88,12 @@ AZStd::unique_ptr<AZ::DynamicModuleHandle> AssetImporterPlugin::LoadSceneLibrary
 void AssetImporterPlugin::EditImportSettings(const AZStd::string& sourceFilePath)
 {
    const QtViewPane* assetImporterPane = GetIEditor()->OpenView(m_toolName.c_str());
+
+    if(!assetImporterPane)
+    {
+        return;
+    }
+
    AssetImporterWindow* assetImporterWindow = qobject_cast<AssetImporterWindow*>(assetImporterPane->Widget());
    if (!assetImporterWindow)
    {