diff options
author | UbitUmarov | 2012-05-28 14:44:06 +0100 |
---|---|---|
committer | UbitUmarov | 2012-05-28 14:44:06 +0100 |
commit | 2122c336b088ebb2900cf6cd061602dda01268e0 (patch) | |
tree | 707728ead894ed02e43d7f51ffaf4d41f965838a /OpenSim/Region | |
parent | let meshs work indenpendently of mesh_sculpted_prim config option (diff) | |
download | opensim-SC_OLD-2122c336b088ebb2900cf6cd061602dda01268e0.zip opensim-SC_OLD-2122c336b088ebb2900cf6cd061602dda01268e0.tar.gz opensim-SC_OLD-2122c336b088ebb2900cf6cd061602dda01268e0.tar.bz2 opensim-SC_OLD-2122c336b088ebb2900cf6cd061602dda01268e0.tar.xz |
a bit cleaner code (?) on sculpts/meshs meshing checking
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs index b0bc18b..286c7f0 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs | |||
@@ -1675,20 +1675,17 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1675 | /// <returns></returns> | 1675 | /// <returns></returns> |
1676 | public bool needsMeshing(PrimitiveBaseShape pbs) | 1676 | public bool needsMeshing(PrimitiveBaseShape pbs) |
1677 | { | 1677 | { |
1678 | |||
1679 | // check sculpts or meshs | 1678 | // check sculpts or meshs |
1680 | if (pbs.SculptEntry) | 1679 | if (pbs.SculptEntry) |
1681 | { | 1680 | { |
1682 | if (pbs.SculptType == (byte)SculptType.Mesh) // always do meshs | 1681 | if (meshSculptedPrim) |
1683 | return true; | 1682 | return true; |
1684 | 1683 | ||
1685 | if (!meshSculptedPrim) | 1684 | if (pbs.SculptType == (byte)SculptType.Mesh) // always do meshs |
1686 | return false; | ||
1687 | else | ||
1688 | return true; | 1685 | return true; |
1689 | } | ||
1690 | 1686 | ||
1691 | int iPropertiesNotSupportedDefault = 0; | 1687 | return false; |
1688 | } | ||
1692 | 1689 | ||
1693 | if (forceSimplePrimMeshing) | 1690 | if (forceSimplePrimMeshing) |
1694 | return true; | 1691 | return true; |
@@ -1719,6 +1716,8 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1719 | // and it's odd.. so for now just return true if asked to force meshs | 1716 | // and it's odd.. so for now just return true if asked to force meshs |
1720 | // hopefully mesher will fail if doesn't suport so things still get basic boxes | 1717 | // hopefully mesher will fail if doesn't suport so things still get basic boxes |
1721 | 1718 | ||
1719 | int iPropertiesNotSupportedDefault = 0; | ||
1720 | |||
1722 | if (pbs.ProfileHollow != 0) | 1721 | if (pbs.ProfileHollow != 0) |
1723 | iPropertiesNotSupportedDefault++; | 1722 | iPropertiesNotSupportedDefault++; |
1724 | 1723 | ||