diff options
author | Jacek Antonelli | 2009-01-28 20:04:52 -0600 |
---|---|---|
committer | Jacek Antonelli | 2009-01-28 20:05:02 -0600 |
commit | 0ef11cf31364456ec247b0fc7ad8f6d1de408400 (patch) | |
tree | 50754b286468147a70271253a2a74215c80e1354 /linden/indra/newview/lldrawpoolbump.cpp | |
parent | Second Life viewer sources 1.22.5-RC (diff) | |
download | meta-impy-0ef11cf31364456ec247b0fc7ad8f6d1de408400.zip meta-impy-0ef11cf31364456ec247b0fc7ad8f6d1de408400.tar.gz meta-impy-0ef11cf31364456ec247b0fc7ad8f6d1de408400.tar.bz2 meta-impy-0ef11cf31364456ec247b0fc7ad8f6d1de408400.tar.xz |
Second Life viewer sources 1.22.6-RC
Diffstat (limited to 'linden/indra/newview/lldrawpoolbump.cpp')
-rw-r--r-- | linden/indra/newview/lldrawpoolbump.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/linden/indra/newview/lldrawpoolbump.cpp b/linden/indra/newview/lldrawpoolbump.cpp index 6221bc8..56f1e4d 100644 --- a/linden/indra/newview/lldrawpoolbump.cpp +++ b/linden/indra/newview/lldrawpoolbump.cpp | |||
@@ -592,7 +592,7 @@ BOOL LLDrawPoolBump::bindBumpMap(LLDrawInfo& params) | |||
592 | if( bump_code < LLStandardBumpmap::sStandardBumpmapCount ) | 592 | if( bump_code < LLStandardBumpmap::sStandardBumpmapCount ) |
593 | { | 593 | { |
594 | bump = gStandardBumpmapList[bump_code].mImage; | 594 | bump = gStandardBumpmapList[bump_code].mImage; |
595 | gBumpImageList.addTextureStats(bump_code, tex->getID(), params.mVSize, 1, 1); | 595 | gBumpImageList.addTextureStats(bump_code, tex->getID(), params.mVSize); |
596 | } | 596 | } |
597 | break; | 597 | break; |
598 | } | 598 | } |
@@ -734,14 +734,13 @@ LLBumpImageList::~LLBumpImageList() | |||
734 | 734 | ||
735 | 735 | ||
736 | // Note: Does nothing for entries in gStandardBumpmapList that are not actually standard bump images (e.g. none, brightness, and darkness) | 736 | // Note: Does nothing for entries in gStandardBumpmapList that are not actually standard bump images (e.g. none, brightness, and darkness) |
737 | void LLBumpImageList::addTextureStats(U8 bump, const LLUUID& base_image_id, | 737 | void LLBumpImageList::addTextureStats(U8 bump, const LLUUID& base_image_id, F32 virtual_size) |
738 | F32 pixel_area, F32 texel_area_ratio, F32 cos_center_angle) | ||
739 | { | 738 | { |
740 | bump &= TEM_BUMP_MASK; | 739 | bump &= TEM_BUMP_MASK; |
741 | LLViewerImage* bump_image = gStandardBumpmapList[bump].mImage; | 740 | LLViewerImage* bump_image = gStandardBumpmapList[bump].mImage; |
742 | if( bump_image ) | 741 | if( bump_image ) |
743 | { | 742 | { |
744 | bump_image->addTextureStats(pixel_area, texel_area_ratio, cos_center_angle); | 743 | bump_image->addTextureStats(virtual_size); |
745 | } | 744 | } |
746 | } | 745 | } |
747 | 746 | ||