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

merge

meow-7.2.2
Dave Parks 2010-10-29 12:07:21 -05:00
parent 2ee9d84f6d b32cb5b1e4
commit b6140462bf
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/llmath/llvolume.cpp
View File

@ -92,11 +92,13 @@ extern BOOL gDebugGL;
void assert_aligned(void* ptr, U32 alignment)
{
#if 0
U32 t = (U32) ptr;
if (t%alignment != 0)
{
llerrs << "WTF?" << llendl;
}
#endif
}
BOOL check_same_clock_dir( const LLVector3& pt1, const LLVector3& pt2, const LLVector3& pt3, const LLVector3& norm)
@ -6600,6 +6602,12 @@ BOOL LLVolumeFace::createSide(LLVolume* volume, BOOL partial_build)
}
}
//clear normals
for (U32 i = 0; i < mNumVertices; i++)
{
mNormals[i].clear();
}
//generate normals
for (U32 i = 0; i < mNumIndices/3; i++) //for each triangle
{

5
indra/newview/llface.cpp
View File

@ -1665,6 +1665,11 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
LLVector4a* dst = (LLVector4a*) colors.get();
S32 num_vecs = num_vertices/4;
if (num_vertices%4 > 0)
{
++num_vecs;
}
for (S32 i = 0; i < num_vecs; i++)
{
dst[i] = src;

5
indra/newview/llviewercontrol.cpp
View File

@ -123,7 +123,10 @@ static bool handleSetShaderChanged(const LLSD& newvalue)
static bool handleLightingDetailChanged(const LLSD& newvalue)
{
gPipeline.setLightingDetail(-1);
if (gPipeline.isInit())
{
gPipeline.setLightingDetail(-1);
}
return true;
}