From 7b4183d7a05079be975c954584ad6215e573755a Mon Sep 17 00:00:00 2001
From: dahlia
Date: Sun, 11 Oct 2009 02:12:17 -0700
Subject: sync PrimMesher with r46

---
 OpenSim/Region/Physics/Meshing/SculptMesh.cs | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/Physics/Meshing/SculptMesh.cs')

diff --git a/OpenSim/Region/Physics/Meshing/SculptMesh.cs b/OpenSim/Region/Physics/Meshing/SculptMesh.cs
index bd63aef..f1dd586 100644
--- a/OpenSim/Region/Physics/Meshing/SculptMesh.cs
+++ b/OpenSim/Region/Physics/Meshing/SculptMesh.cs
@@ -436,9 +436,9 @@ namespace PrimMesher
             {
                 Face face = this.faces[i];
                 Coord surfaceNormal = face.SurfaceNormal(this.coords);
-                this.normals[face.v1] += surfaceNormal;
-                this.normals[face.v2] += surfaceNormal;
-                this.normals[face.v3] += surfaceNormal;
+                this.normals[face.n1] += surfaceNormal;
+                this.normals[face.n2] += surfaceNormal;
+                this.normals[face.n3] += surfaceNormal;
             }
 
             int numNormals = this.normals.Count;
@@ -462,6 +462,10 @@ namespace PrimMesher
                 vf.v2 = this.coords[face.v2];
                 vf.v3 = this.coords[face.v3];
 
+                vf.coordIndex1 = face.v1;
+                vf.coordIndex2 = face.v2;
+                vf.coordIndex3 = face.v3;
+
                 vf.n1 = this.normals[face.n1];
                 vf.n2 = this.normals[face.n2];
                 vf.n3 = this.normals[face.n3];
@@ -520,6 +524,10 @@ namespace PrimMesher
             for (i = 0; i < numVerts; i++)
                 this.coords[i] *= q;
 
+            int numNormals = this.normals.Count;
+            for (i = 0; i < numNormals; i++)
+                this.normals[i] *= q;
+
             if (this.viewerFaces != null)
             {
                 int numViewerFaces = this.viewerFaces.Count;
-- 
cgit v1.1