GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/1.11' into sdl_platform_1.11

Browse Source 
# Conflicts:
#	Source/Engine/Platform/Windows/WindowsPlatform.cpp
#	Source/Tools/Flax.Build/Build/ProjectTarget.cs
#	Source/Tools/Flax.Build/Configuration.cs
This commit is contained in:
Ari Vuollet
2025-09-07 19:31:16 +03:00
parent d70a003617 42b542d190
commit 1d8f221f1b
470 changed files with 53355 additions and 3350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Tools/Flax.Build/Bindings/BindingsGenerator.cs
View File

@@ -271,8 +271,8 @@ namespace Flax.Build.Bindings
{
if (string.Equals(token.Value, ApiTokens.Class, StringComparison.Ordinal))
{
if (!(context.ScopeInfo is FileInfo))
throw new NotImplementedException("TODO: add support for nested classes in scripting API");
if (!(context.ScopeInfo is FileInfo) && !(context.ScopeInfo is ClassInfo))
throw new Exception($"Not supported nested class at line {tokenizer.CurrentLine}. Classes can be nested only in other classes (or in global scope).");
var classInfo = ParseClass(ref context);
scopeType = classInfo;