ソースを参照

Fixing a nasty crash due to invalid UINT64/INT64 serialization
Fixing typo in docs

BearishSun 9 年 前
コミット
bae9146bb0

+ 1 - 1
Documentation/Manuals/Native/bslfx.md

@@ -4,7 +4,7 @@ Banshee Shading Language FX			{#bslfx}
 
 
 BSLFX is a material definition language that allows you to specify non-programmable render states together with programmable ones. For example BSLFX will allow you to define a set of input parameters, rasterizer, depth-stencil and blend states along with actual vertex/fragment GPU program code.
 BSLFX is a material definition language that allows you to specify non-programmable render states together with programmable ones. For example BSLFX will allow you to define a set of input parameters, rasterizer, depth-stencil and blend states along with actual vertex/fragment GPU program code.
 
 
-Actual GPU program code itself it written in any of the standard languages: HLSL or GLSL. A unified shading language is in the works so you will don't have to write separate code for DirectX and OpenGL renderers.
+Actual GPU program code itself is written in any of the standard languages: HLSL or GLSL. A unified shading language is in the works so you will don't have to write separate code for DirectX and OpenGL renderers.
 
 
 Before continuing it is highly suggested you read the [material](@ref materials) manual, as it describes how to create shaders without the use of BSLFX which can provide a good background of where BSLFX is useful.
 Before continuing it is highly suggested you read the [material](@ref materials) manual, as it describes how to create shaders without the use of BSLFX which can provide a good background of where BSLFX is useful.
 
 

+ 2 - 2
Source/BansheeMono/Source/BsMonoUtil.cpp

@@ -201,9 +201,9 @@ namespace BansheeEngine
 		case MONO_TYPE_U4:
 		case MONO_TYPE_U4:
 			return MonoPrimitiveType::U32;
 			return MonoPrimitiveType::U32;
 		case MONO_TYPE_I8:
 		case MONO_TYPE_I8:
-			return MonoPrimitiveType::I32;
+			return MonoPrimitiveType::I64;
 		case MONO_TYPE_U8:
 		case MONO_TYPE_U8:
-			return MonoPrimitiveType::U32;
+			return MonoPrimitiveType::U64;
 		case MONO_TYPE_R4:
 		case MONO_TYPE_R4:
 			return MonoPrimitiveType::R32;
 			return MonoPrimitiveType::R32;
 		case MONO_TYPE_R8:
 		case MONO_TYPE_R8:

+ 1 - 1
Source/MBansheeEditor/Windows/Inspector/InspectorPersistentData.cs

@@ -49,7 +49,7 @@ namespace BansheeEditor
             SerializableProperties output;
             SerializableProperties output;
             if (!resourceProperties.TryGetValue(uuid, out output))
             if (!resourceProperties.TryGetValue(uuid, out output))
             {
             {
-                output = new SerializableProperties(); ;
+                output = new SerializableProperties();
                 resourceProperties[uuid] = output;
                 resourceProperties[uuid] = output;
             }
             }