livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for blend func being screwed up at init. 

Fix for avatar appearance editor drawing hair in the background.
master
Dave Parks 2010-02-08 19:15:43 -06:00
parent bd10ded1da
commit b8739946be
5 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llrender/llrender.cpp
View File

@ -763,8 +763,8 @@ LLRender::LLRender()
mCurrAlphaFunc = CF_DEFAULT;
mCurrAlphaFuncVal = 0.01f;
mCurrBlendSFactor = BF_SOURCE_ALPHA;
mCurrBlendDFactor = BF_ONE_MINUS_SOURCE_ALPHA;
mCurrBlendSFactor = BF_ONE;
mCurrBlendDFactor = BF_ZERO;
}
LLRender::~LLRender()

8
indra/llui/llui.cpp
View File

@ -710,19 +710,19 @@ void gl_draw_scaled_rotated_image(S32 x, S32 y, S32 width, S32 height, F32 degre
v = LLVector3(offset_x, offset_y, 0.f) * quat;
gGL.texCoord2f(uv_rect.mRight, uv_rect.mTop);
gGL.vertex2i(v.mV[0], v.mV[1] );
gGL.vertex2f(v.mV[0], v.mV[1] );
v = LLVector3(-offset_x, offset_y, 0.f) * quat;
gGL.texCoord2f(uv_rect.mLeft, uv_rect.mTop);
gGL.vertex2i(v.mV[0], v.mV[1] );
gGL.vertex2f(v.mV[0], v.mV[1] );
v = LLVector3(-offset_x, -offset_y, 0.f) * quat;
gGL.texCoord2f(uv_rect.mLeft, uv_rect.mBottom);
gGL.vertex2i(v.mV[0], v.mV[1] );
gGL.vertex2f(v.mV[0], v.mV[1] );
v = LLVector3(offset_x, -offset_y, 0.f) * quat;
gGL.texCoord2f(uv_rect.mRight, uv_rect.mBottom);
gGL.vertex2i(v.mV[0], v.mV[1] );
gGL.vertex2f(v.mV[0], v.mV[1] );
}
gGL.end();
gGL.popUIMatrix();

2
indra/newview/app_settings/settings.xml
View File

@ -7452,7 +7452,7 @@
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
<integer>0</integer>
</map>
<key>RenderUseFarClip</key>
<map>

5
indra/newview/llfloaterimagepreview.cpp
View File

@ -688,6 +688,9 @@ BOOL LLImagePreviewAvatar::render()
mNeedsUpdate = FALSE;
LLVOAvatar* avatarp = mDummyAvatar;
gGL.pushUIMatrix();
gGL.loadUIIdentity();
glMatrixMode(GL_PROJECTION);
gGL.pushMatrix();
glLoadIdentity();
@ -696,6 +699,7 @@ BOOL LLImagePreviewAvatar::render()
glMatrixMode(GL_MODELVIEW);
gGL.pushMatrix();
glLoadIdentity();
LLGLSUIDefault def;
gGL.color4f(0.15f, 0.2f, 0.3f, 1.f);
@ -741,6 +745,7 @@ BOOL LLImagePreviewAvatar::render()
avatarPoolp->renderAvatars(avatarp); // renders only one avatar
}
gGL.popUIMatrix();
gGL.color4f(1,1,1,1);
return TRUE;
}

12
indra/newview/lltoolmorph.cpp
View File

@ -167,13 +167,16 @@ BOOL LLVisualParamHint::render()
LLVisualParamReset::sDirty = TRUE;
LLVOAvatar* avatarp = gAgent.getAvatarObject();
gGL.pushUIMatrix();
gGL.loadUIIdentity();
glMatrixMode(GL_PROJECTION);
glPushMatrix();
gGL.pushMatrix();
glLoadIdentity();
glOrtho(0.0f, mFullWidth, 0.0f, mFullHeight, -1.0f, 1.0f);
glMatrixMode(GL_MODELVIEW);
glPushMatrix();
gGL.pushMatrix();
glLoadIdentity();
LLGLSUIDefault gls_ui;
@ -181,10 +184,10 @@ BOOL LLVisualParamHint::render()
mBackgroundp->draw(0, 0, mFullWidth, mFullHeight);
glMatrixMode(GL_PROJECTION);
glPopMatrix();
gGL.popMatrix();
glMatrixMode(GL_MODELVIEW);
glPopMatrix();
gGL.popMatrix();
mNeedsUpdate = FALSE;
mIsVisible = TRUE;
@ -247,6 +250,7 @@ BOOL LLVisualParamHint::render()
mVisualParam->setWeight(mLastParamWeight, FALSE);
gGL.color4f(1,1,1,1);
mGLTexturep->setGLTextureCreated(true);
gGL.popUIMatrix();
return TRUE;
}