diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-10-03 18:16:48 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-10-03 18:16:48 -0400 |
| commit | 13d6a9920d06bd718b632c0980f8340909b8187c (patch) | |
| tree | 67d55c64b9a951f7ec3ff82823efbd7055c12673 /indra/newview | |
| parent | e29b66ed6ce29528f7b733c51db22a31a05d3a5f (diff) | |
| parent | 358b0ca5fffbd2357233ba789e8f2f2a9691cf14 (diff) | |
merge
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llviewertexlayer.cpp | 21 | ||||
| -rw-r--r-- | indra/newview/llviewertexlayer.h | 1 |
2 files changed, 3 insertions, 19 deletions
diff --git a/indra/newview/llviewertexlayer.cpp b/indra/newview/llviewertexlayer.cpp index b129c28e0d..cd5e781d71 100755 --- a/indra/newview/llviewertexlayer.cpp +++ b/indra/newview/llviewertexlayer.cpp @@ -379,7 +379,9 @@ void LLViewerTexLayerSetBuffer::doUpload() LLGLSUIDefault gls_ui; LLPointer<LLImageRaw> baked_mask_image = new LLImageRaw(mFullWidth, mFullHeight, 1 ); U8* baked_mask_data = baked_mask_image->getData(); - layer_set->gatherMorphMaskAlpha(baked_mask_data, mFullWidth, mFullHeight); + layer_set->gatherMorphMaskAlpha(baked_mask_data, + mOrigin.mX, mOrigin.mY, + mFullWidth, mFullHeight); // Create the baked image from our color and mask information @@ -700,23 +702,6 @@ void LLViewerTexLayerSet::setUpdatesEnabled( BOOL b ) mUpdatesEnabled = b; } - -void LLViewerTexLayerSet::gatherMorphMaskAlpha(U8 *data, S32 width, S32 height) -{ - memset(data, 255, width * height); - - for( layer_list_t::iterator iter = mLayerList.begin(); iter != mLayerList.end(); iter++ ) - { - LLTexLayerInterface* layer = *iter; - layer->gatherAlphaMasks(data, getViewerComposite()->getOriginX(), - getViewerComposite()->getOriginY(), width, height); - } - - // Set alpha back to that of our alpha masks. - renderAlphaMaskTextures(getViewerComposite()->getOriginX(), - getViewerComposite()->getOriginY(), width, height, true); -} - LLVOAvatarSelf* LLViewerTexLayerSet::getAvatar() { return dynamic_cast<LLVOAvatarSelf*> (mAvatarAppearance); diff --git a/indra/newview/llviewertexlayer.h b/indra/newview/llviewertexlayer.h index 9df9474eff..959c883da8 100644 --- a/indra/newview/llviewertexlayer.h +++ b/indra/newview/llviewertexlayer.h @@ -55,7 +55,6 @@ public: /*virtual*/void createComposite(); void setUpdatesEnabled(BOOL b); BOOL getUpdatesEnabled() const { return mUpdatesEnabled; } - void gatherMorphMaskAlpha(U8 *data, S32 width, S32 height); LLVOAvatarSelf* getAvatar(); const LLVOAvatarSelf* getAvatar() const; |