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

Merge branch 'master' of git://github.com/Shyotl/SingularityViewer

Browse Source
This commit is contained in:
Latif Khalifa
2014-02-21 09:30:08 +01:00
parent ebb46999d8 bb0f17ae6f
commit 9d6092faaa
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/llviewercontrol.cpp
View File

@@ -679,6 +679,7 @@ void settings_setup_listeners()
gSavedSettings.getControl("RenderAutoMaskAlphaNonDeferred")->getSignal()->connect(boost::bind(&handleResetVertexBuffersChanged, _2)); gSavedSettings.getControl("RenderAutoMaskAlphaNonDeferred")->getSignal()->connect(boost::bind(&handleResetVertexBuffersChanged, _2));
gSavedSettings.getControl("SHUseRMSEAutoMask")->getSignal()->connect(boost::bind(&handleResetVertexBuffersChanged, _2)); gSavedSettings.getControl("SHUseRMSEAutoMask")->getSignal()->connect(boost::bind(&handleResetVertexBuffersChanged, _2));
gSavedSettings.getControl("SHAutoMaskMaxRMSE")->getSignal()->connect(boost::bind(&handleResetVertexBuffersChanged, _2)); gSavedSettings.getControl("SHAutoMaskMaxRMSE")->getSignal()->connect(boost::bind(&handleResetVertexBuffersChanged, _2));
gSavedSettings.getControl("SHAltBatching")->getSignal()->connect(boost::bind(&handleResetVertexBuffersChanged, _2));
gSavedSettings.getControl("RenderObjectBump")->getSignal()->connect(boost::bind(&handleResetVertexBuffersChanged, _2)); gSavedSettings.getControl("RenderObjectBump")->getSignal()->connect(boost::bind(&handleResetVertexBuffersChanged, _2));
gSavedSettings.getControl("RenderMaxVBOSize")->getSignal()->connect(boost::bind(&handleResetVertexBuffersChanged, _2)); gSavedSettings.getControl("RenderMaxVBOSize")->getSignal()->connect(boost::bind(&handleResetVertexBuffersChanged, _2));
//See LL jira VWR-3258 comment section. Implemented by LL in 2.1 -Shyotl //See LL jira VWR-3258 comment section. Implemented by LL in 2.1 -Shyotl

10
indra/newview/llvovolume.cpp
View File

@@ -5402,15 +5402,15 @@ struct CompareBatchBreakerModified
{ {
return lhs->isState(LLFace::FULLBRIGHT) < rhs->isState(LLFace::FULLBRIGHT); return lhs->isState(LLFace::FULLBRIGHT) < rhs->isState(LLFace::FULLBRIGHT);
} }
else if(batch_shiny && lte->getShiny() != rte->getShiny()) else if(batch_shiny && !lte->getShiny() != !rte->getShiny())
{ {
return lte->getShiny() < rte->getShiny(); return !lte->getShiny() < !rte->getShiny();
} }
else if(lhs->getPoolType() == LLDrawPool::POOL_MATERIALS) else if(lhs->getPoolType() == LLDrawPool::POOL_MATERIALS && lte->getMaterialParams().get() != rte->getMaterialParams().get())
{ {
return lte->getMaterialParams().get() < rte->getMaterialParams().get(); return lte->getMaterialParams().get() < rte->getMaterialParams().get();
} }
else if(lhs->getPoolType() == LLDrawPool::POOL_BUMP) else if(lhs->getPoolType() == LLDrawPool::POOL_BUMP && lte->getBumpmap() != rte->getBumpmap())
{ {
return lte->getBumpmap() < rte->getBumpmap(); return lte->getBumpmap() < rte->getBumpmap();
} }
@@ -5634,7 +5634,7 @@ void LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, LLFac
{ {
facep->setTextureIndex(0); facep->setTextureIndex(0);
if(can_batch_texture(facep) && texture_index_channels > 1) if(can_batch_texture(facep))
{ {
static const U8 MAX_TEXTURE_COUNT = 32; static const U8 MAX_TEXTURE_COUNT = 32;
static LLViewerTexture* texture_list[MAX_TEXTURE_COUNT]; static LLViewerTexture* texture_list[MAX_TEXTURE_COUNT];