Diff of /branches/Axiom_Upgrade_0.8.0/mvsm/TreeGroup.cs [r286] .. [r287]  Maximize  Restore

  Switch to side-by-side view

--- a/branches/Axiom_Upgrade_0.8.0/mvsm/TreeGroup.cs
+++ b/branches/Axiom_Upgrade_0.8.0/mvsm/TreeGroup.cs
@@ -689,7 +689,7 @@
                 vertexData.vertexBufferBinding.SetBinding(0, hvBuffer);
 
                 // lock the vertex buffer
-                IntPtr ipBuf = hvBuffer.Lock(BufferLocking.Discard);
+                IntPtr ipBuf = (IntPtr)hvBuffer.Lock(BufferLocking.Discard).Ptr;
 
                 int bufferOff = 0;
 
@@ -766,7 +766,7 @@
                     indexData.indexBuffer = HardwareBufferManager.Instance.CreateIndexBuffer(
                         IndexType.Size16, numIndices, BufferUsage.StaticWriteOnly);
 
-                    IntPtr indexBufferPtr = indexData.indexBuffer.Lock(0, indexData.indexBuffer.Size, BufferLocking.Discard);
+                    IntPtr indexBufferPtr = (IntPtr)indexData.indexBuffer.Lock(0, indexData.indexBuffer.Size, BufferLocking.Discard).Ptr;
 
                     unsafe
                     {
@@ -816,13 +816,14 @@
 
                 // create the hardware vertex buffer and set up the buffer binding
                 HardwareVertexBuffer hvBuffer = HardwareBufferManager.Instance.CreateVertexBuffer(
-                    vertexData.vertexDeclaration.GetVertexSize(0), vertexData.vertexCount,
+                    vertexData.vertexDeclaration, vertexData.vertexCount,
+                    //vertexData.vertexDeclaration.GetVertexSize(0), vertexData.vertexCount,
                     BufferUsage.StaticWriteOnly, false);
 
                 vertexData.vertexBufferBinding.SetBinding(0, hvBuffer);
 
                 // lock the vertex buffer
-                IntPtr ipBuf = hvBuffer.Lock(BufferLocking.Discard);
+                IntPtr ipBuf = (IntPtr)hvBuffer.Lock(BufferLocking.Discard).Ptr;
 
                 int bufferOff = 0;
 
@@ -966,7 +967,7 @@
                 indexData.indexBuffer = HardwareBufferManager.Instance.CreateIndexBuffer(
                     IndexType.Size16, numIndices, BufferUsage.StaticWriteOnly);
 
-                IntPtr indexBufferPtr = indexData.indexBuffer.Lock(0, indexData.indexBuffer.Size, BufferLocking.Discard);
+                IntPtr indexBufferPtr = (IntPtr)indexData.indexBuffer.Lock(0, indexData.indexBuffer.Size, BufferLocking.Discard).Ptr;
 
                 unsafe
                 {