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

Merge branch 'master' of git://github.com/Crawcik/FlaxEngine into Crawcik-master

Browse Source
This commit is contained in:
Wojtek Figat
2021-04-28 10:26:05 +02:00
parent 774c4b65fe ac33ba432d
commit 2051a724ae
4 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Engine/Scripting/ManagedCLR/MClass.Mono.cpp
View File

@@ -51,10 +51,12 @@ MClass::MClass(const MAssembly* parentAssembly, MonoClass* monoClass, const MStr
case MONO_TYPE_ATTR_NESTED_ASSEMBLY:
_visibility = MVisibility::Internal;
break;
case MONO_TYPE_ATTR_NESTED_FAM_AND_ASSEM:
case MONO_TYPE_ATTR_NESTED_FAM_OR_ASSEM:
_visibility = MVisibility::ProtectedInternal;
break;
case MONO_TYPE_ATTR_NESTED_FAM_AND_ASSEM:
_visibility = MVisibility::PrivateProtected;
break;
default:
CRASH;
}

5
Source/Engine/Scripting/ManagedCLR/MField.Mono.cpp
View File

@@ -28,7 +28,7 @@ MField::MField(MonoClassField* monoField, const char* name, MClass* parentClass)
_visibility = MVisibility::Private;
break;
case MONO_FIELD_ATTR_FAM_AND_ASSEM:
_visibility = MVisibility::ProtectedInternal;
_visibility = MVisibility::PrivateProtected;
break;
case MONO_FIELD_ATTR_ASSEMBLY:
_visibility = MVisibility::Internal;
@@ -36,6 +36,9 @@ MField::MField(MonoClassField* monoField, const char* name, MClass* parentClass)
case MONO_FIELD_ATTR_FAMILY:
_visibility = MVisibility::Protected;
break;
case MONO_FIELD_ATTR_FAM_OR_ASSEM:
_visibility = MVisibility::ProtectedInternal;
break;
case MONO_FIELD_ATTR_PUBLIC:
_visibility = MVisibility::Public;
break;

5
Source/Engine/Scripting/ManagedCLR/MMethod.Mono.cpp
View File

@@ -34,7 +34,7 @@ MMethod::MMethod(MonoMethod* monoMethod, const char* name, MClass* parentClass)
_visibility = MVisibility::Private;
break;
case MONO_METHOD_ATTR_FAM_AND_ASSEM:
_visibility = MVisibility::ProtectedInternal;
_visibility = MVisibility::PrivateProtected;
break;
case MONO_METHOD_ATTR_ASSEM:
_visibility = MVisibility::Internal;
@@ -42,6 +42,9 @@ MMethod::MMethod(MonoMethod* monoMethod, const char* name, MClass* parentClass)
case MONO_METHOD_ATTR_FAMILY:
_visibility = MVisibility::Protected;
break;
case MONO_METHOD_ATTR_FAM_OR_ASSEM:
_visibility = MVisibility::ProtectedInternal;
break;
case MONO_METHOD_ATTR_PUBLIC:
_visibility = MVisibility::Public;
break;

3
Source/Engine/Scripting/ManagedCLR/MTypes.h
View File

@@ -62,8 +62,9 @@ class MType;
enum class MVisibility
{
Private,
Protected,
PrivateProtected,
Internal,
Protected,
ProtectedInternal,
Public,
};