diff options
| author | David Walter Seikel | 2013-07-15 03:59:58 +1000 |
|---|---|---|
| committer | David Walter Seikel | 2013-07-15 03:59:58 +1000 |
| commit | c7f06e9e63a54874696fe89e2ef24c809bef51f3 (patch) | |
| tree | 3eb207f344435fbeb82b142000980416d50690cd /linden/indra/llmath/llvolume.cpp | |
| parent | More Windlight refactoring, including moving the new stuff back to lightshare.c. (diff) | |
| parent | Fix Align tool conflicts with Edit Linked Parts - http://redmine.kokuaviewer.... (diff) | |
| download | meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.zip meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.gz meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.bz2 meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.xz | |
Merge remote-tracking branch 'origin/next' into WL-refactor
Diffstat (limited to 'linden/indra/llmath/llvolume.cpp')
| -rw-r--r-- | linden/indra/llmath/llvolume.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/linden/indra/llmath/llvolume.cpp b/linden/indra/llmath/llvolume.cpp index 618048c..9dc3746 100644 --- a/linden/indra/llmath/llvolume.cpp +++ b/linden/indra/llmath/llvolume.cpp | |||
| @@ -4437,14 +4437,7 @@ BOOL LLVolumeFace::createUnCutCubeCap(LLVolume* volume, BOOL partial_build) | |||
| 4437 | const std::vector<LLVector3>& profile = volume->getProfile().mProfile; | 4437 | const std::vector<LLVector3>& profile = volume->getProfile().mProfile; |
| 4438 | S32 max_s = volume->getProfile().getTotal(); | 4438 | S32 max_s = volume->getProfile().getTotal(); |
| 4439 | S32 max_t = volume->getPath().mPath.size(); | 4439 | S32 max_t = volume->getPath().mPath.size(); |
| 4440 | 4440 | S32 grid_size = (profile.size() - 1) / 4; | |
| 4441 | // S32 i; | ||
| 4442 | S32 num_vertices = 0, num_indices = 0; | ||
| 4443 | S32 grid_size = (profile.size()-1)/4; | ||
| 4444 | S32 quad_count = (grid_size * grid_size); | ||
| 4445 | |||
| 4446 | num_vertices = (grid_size+1)*(grid_size+1); | ||
| 4447 | num_indices = quad_count * 4; | ||
| 4448 | 4441 | ||
| 4449 | LLVector3& min = mExtents[0]; | 4442 | LLVector3& min = mExtents[0]; |
| 4450 | LLVector3& max = mExtents[1]; | 4443 | LLVector3& max = mExtents[1]; |