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

Merged in ruslantproductengine/viewer-neko-ruslant-4-cr (pull request #60) 

MAINT-5018 crashing when touching mesh
meow-7.2.2
Ruslan Teliuk 2016-10-20 16:50:35 +00:00
parent 10f7847c8b a47896f4b9
commit 0ac937200b
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llrender/llvertexbuffer.cpp
View File

@ -448,7 +448,7 @@ void LLVertexBuffer::setupClientArrays(U32 data_mask)
else
{
GLenum array[] =
static const GLenum array[] =
{
GL_VERTEX_ARRAY,
GL_NORMAL_ARRAY,
@ -456,7 +456,7 @@ void LLVertexBuffer::setupClientArrays(U32 data_mask)
GL_COLOR_ARRAY,
};
GLenum mask[] =
static const GLenum mask[] =
{
MAP_VERTEX,
MAP_NORMAL,

3
indra/newview/llselectmgr.cpp
View File

@ -6244,6 +6244,9 @@ void pushWireframe(LLDrawable* drawable)
void LLSelectNode::renderOneWireframe(const LLColor4& color)
{
//Need to because crash on ATI 3800 (and similar cards) MAINT-5018
LLGLDisable multisample(LLPipeline::RenderFSAASamples > 0 ? GL_MULTISAMPLE_ARB : 0);
LLViewerObject* objectp = getObject();
if (!objectp)
{