Merge branch 'Crawcik-master'

Source/Engine/Scripting/ManagedCLR/MClass.Mono.cpp

@@ -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;
     }

Source/Engine/Scripting/ManagedCLR/MField.Mono.cpp

@@ -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;

Source/Engine/Scripting/ManagedCLR/MMethod.Mono.cpp

@@ -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;

Source/Engine/Scripting/ManagedCLR/MTypes.h

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