ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 17:32:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix bad merge

Browse Source
This commit is contained in:
UbitUmarov
2025-06-19 17:54:12 +01:00
parent 4e822198b3
commit ad98f567c2
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs
View File

@@ -703,7 +703,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
private static bool GenerateCoordsAndFacesFromPrimSculptData(
string primName, PrimitiveBaseShape primShape, float lod, out List<Vector3> coords, out List<Face> faces)
{
coords = new List<Coord>();
coords = new List<Vector3>();
faces = new List<Face>();
PrimMesher.SculptMesh sculptMesh;
Image idata;

4
OpenSim/Region/PhysicsModules/ubOdeMeshing/SculptMap.cs
View File

@@ -133,12 +133,12 @@ namespace PrimMesher
bm.Dispose();
}
public List<List<Coord>> ToRows(bool mirror)
public List<List<Vector3>> ToRows(bool mirror)
{
int numRows = height;
int numCols = width;
List<List<Coord>> rows = new List<List<Coord>>(numRows);
List<List<Vector3>> rows = new List<List<Vector3>>(numRows);
float pixScale = 1.0f / 255;

2
OpenSim/Region/PhysicsModules/ubOdeMeshing/SculptMesh.cs
View File

@@ -38,7 +38,7 @@ namespace PrimMesher
public class SculptMesh
{
public List<Coord> coords;
public List<Vector3> coords;
public List<Face> faces;
public enum SculptType { sphere = 1, torus = 2, plane = 3, cylinder = 4 };