Skip to content

Commit

Permalink
fix: build fix / scene validation fix
Browse files Browse the repository at this point in the history
  • Loading branch information
stan-osipov committed Oct 18, 2020
1 parent cd43000 commit 3905766
Showing 1 changed file with 5 additions and 6 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using StansAssets.SceneManagement.Build;
using UnityEditor;
using UnityEngine;
using UnityEngine.AddressableAssets;
using UnityEngine.ResourceManagement.AsyncOperations;
Expand Down Expand Up @@ -64,9 +63,8 @@ public static IAsyncOperation LoadAdditively(string sceneName, Action<Scene> loa
{
return LoadAddressableAdditively(sceneName, loadCompleted);
}
else {
return LoadAdditively(sceneName, -1, loadCompleted);
}

return LoadAdditively(sceneName, -1, loadCompleted);
}

static IAsyncOperation LoadAdditively(string sceneName, int buildIndex, Action<Scene> loadCompleted = null)
Expand Down Expand Up @@ -395,13 +393,14 @@ static bool ValidateScene(string sceneName) {
if (BuildConfigurationSettings.Instance.HasValidConfiguration) {
return BuildConfigurationSettings.Instance.Configuration.HasScene(sceneName);
}
return SceneManager.GetSceneByName(sceneName).IsValid();

return true;
}
}

static class AddressablesLogger
{
public static bool Verbose = false;
public static readonly bool Verbose = false;

public static void Log(string msg)
{
Expand Down

0 comments on commit 3905766

Please sign in to comment.