Merge branch 'MarcoROG-master'

Data/Raw/Editor/Includes/PickingCull.bslinc

@@ -30,7 +30,7 @@ mixin PickingCull
 			out float4 oNorm : SV_Target1
 		) : SV_Target0
 		{
-			oNorm = (inNorm + float4(1,1,1,0)) / 2;
+			oNorm = inNorm;
 			return gColorIndex;
 		}
 	};

Source/BansheeCore/Source/BsPixelUtil.cpp

@@ -1837,6 +1837,7 @@ namespace bs
 		}
 		
 		UINT32* color = (UINT32 *)src;
+		UINT32 masked = 0;
 		switch (format) 
 		{
 		case PF_D24S8:
@@ -1846,10 +1847,12 @@ namespace bs
 			return static_cast<float>(*color & 0xFFFF) / (float)65536;
 			break;
 		case PF_D32:
-			return static_cast<float>(*color & 0xFFFFFFFF) / (float)4294967296;
+			masked = *color & 0xFFFFFFFF;
+			return *((float*)&masked);
 			break;
 		case PF_D32_S8X24:
-			return static_cast<float>(*color & 0xFFFFFFFF) / (float)4294967296;
+			masked = *color & 0xFFFFFFFF;
+			return *( (float*) &masked );
 			break;
 		default:
 			LOGERR("Cannot unpack from " + getFormatName(format));

Source/BansheeEditor/Source/BsScenePicking.cpp

@@ -261,7 +261,7 @@ namespace bs
 		normalTexDesc.type = TEX_TYPE_2D;
 		normalTexDesc.width = outputTextureProperties.getWidth();
 		normalTexDesc.height = outputTextureProperties.getHeight();
-		normalTexDesc.format = PF_RGBA8;
+		normalTexDesc.format = PF_FLOAT_R11G11B10;
 		normalTexDesc.usage = TU_RENDERTARGET;
 
 		SPtr<Texture> normalsTexture = Texture::create(normalTexDesc);

Source/BansheeEngine/Source/BsShapeMeshes3D.cpp

@@ -534,7 +534,7 @@ namespace bs
 		if (outNormals != nullptr)
 		{
 			outNormals += (vertexOffset * vertexStride);
-			for (UINT32 face = 0; face < 4; face++)
+			for (UINT32 face = 0; face < 6; face++)
 			{
 				outNormals = writeVector3(outNormals, vertexStride, faceNormals[face]);
 				outNormals = writeVector3(outNormals, vertexStride, faceNormals[face]);

Source/Examples/ExampleGettingStarted/Source/Main.cpp

@@ -190,7 +190,7 @@ namespace bs
 				importOptions->setCPUCached(true);
 			}
 
-			model = gImporter().import<Mesh>(exampleModelPath);
+			model = gImporter().import<Mesh>(exampleModelPath, meshImportOptions);
 
 			// Save for later use, so we don't have to import on the next run.
 			gResources().save(model, exampleModelAssetPath, true);