Skip to content

Commit

Permalink
Merging from develop
Browse files Browse the repository at this point in the history
  • Loading branch information
raulssorban committed Apr 4, 2024
2 parents f9ef65d + f50fa54 commit c22e5e8
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Carbon.Core/Carbon/src/Loaders/ScriptLoader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -535,8 +535,8 @@ public void Dispose()
}

Sources?.Clear();
Sources = null;
Scripts?.Clear();
Sources = null;
Scripts = null;

Community.Runtime.ScriptProcessor.StopCoroutine(Compile());
Expand Down
2 changes: 1 addition & 1 deletion Tools/Build/linux/update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ BASE="$(cd -- "$(dirname "$0")" >/dev/null 2>&1; pwd -P)"
ROOT="$(realpath "${BASE}/../../../")"

# Get the target depot argument
TARGET=${1:-release}
TARGET=${1:-public}

mono "${ROOT}/Tools/Helpers/CodeGen.exe" \
--plugininput "${ROOT}/Carbon.Core/Carbon.Components/Carbon.Common/src/Carbon/Core" \
Expand Down
2 changes: 1 addition & 1 deletion Tools/Build/win/update.bat
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ popd

rem Get the target depot argument
if "%1" EQU "" (
set UPDATE_TARGET=release
set UPDATE_TARGET=public
) else (
set UPDATE_TARGET=%1
)
Expand Down

0 comments on commit c22e5e8

Please sign in to comment.