Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Cupcake' of https://github.com/LightDrake/SingularityViewer into Frosting

Browse Source 
Conflicts:
	indra/newview/llviewerwindow.cpp - Also two compile fixes.
This commit is contained in:
Lirusaito
2013-04-10 13:26:48 -04:00
parent fd9f8fa71f eb25270df0
commit 8c49716eae
93 changed files with 1323 additions and 600 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
indra/llui/llview.cpp
View File

@@ -1152,6 +1152,7 @@ void LLView::draw()
drawChildren();
}
extern void check_blend_funcs();
void LLView::drawChildren()
{
@@ -1186,7 +1187,9 @@ void LLView::drawChildren()
LLUI::translate((F32)viewp->getRect().mLeft, (F32)viewp->getRect().mBottom, 0.f);
// flag the fact we are in draw here, in case overridden draw() method attempts to remove this widget
viewp->mInDraw = true;
if(gDebugGL)check_blend_funcs();
viewp->draw();
if(gDebugGL)check_blend_funcs();
viewp->mInDraw = false;
if (sDebugRects)
@@ -1293,7 +1296,9 @@ void LLView::drawChild(LLView* childp, S32 x_offset, S32 y_offset, BOOL force_dr
LLUI::pushMatrix();
{
LLUI::translate((F32)childp->getRect().mLeft + x_offset, (F32)childp->getRect().mBottom + y_offset, 0.f);
if(gDebugGL)check_blend_funcs();
childp->draw();
if(gDebugGL)check_blend_funcs();
}
LLUI::popMatrix();
}