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

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

Browse Source
This commit is contained in:
Lirusaito
2019-03-27 18:42:18 -04:00
parent 81277c2b25 3a031e9364
commit adb0efdf97
3 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/gpu_table.txt
View File

@@ -276,6 +276,8 @@ AMD RV730 (HD 4600) .*RV730.* 3 1
AMD RV740 (HD 4700) .*RV740.* 3 1
AMD RV770 (HD 4800) .*RV770.* 3 1
AMD RV790 (HD 4800) .*RV790.* 3 1
AMD Vega .*AMD.*Vega.* 3 1
AMD Radeon VII .*AMD.*Radeon ?VII.* 3 1
ATI 760G/Radeon 3000 .*ATI.*AMD 760G.* 1 1
ATI 780L/Radeon 3000 .*ATI.*AMD 780L.* 1 1
ATI Radeon DDR .*ATI.*Radeon ?DDR.* 0 1

4
indra/newview/llspatialpartition.cpp
View File

@@ -1963,7 +1963,9 @@ void renderBoundingBox(LLDrawable* drawable, BOOL set_color = TRUE)
const LLVector4a* ext;
LLVector4a pos, size;
if (drawable->getVOVolume())
static LLCachedControl<bool> sh_override_rigged_bounds("SHOverrideRiggedBounds", false);
LLVOVolume* volume = drawable->getVOVolume();
if (volume && (!sh_override_rigged_bounds || !volume->isAttachment() || !(drawable->isState(LLDrawable::RIGGED) || volume->isRiggedMesh())))
{
//render face bounding boxes
for (S32 i = 0; i < drawable->getNumFaces(); i++)

16
indra/newview/llvovolume.cpp
View File

@@ -1557,10 +1557,21 @@ BOOL LLVOVolume::genBBoxes(BOOL force_global)
bool any_valid_boxes = false;
if (getRiggedVolume())
static LLCachedControl<bool> sh_override_rigged_bounds("SHOverrideRiggedBounds", false);
if (sh_override_rigged_bounds && isAttachment() && (mDrawable->isState(LLDrawable::RIGGED) || isRiggedMesh()))
{
LL_DEBUGS("RiggedBox") << "rebuilding box, volume face count " << getVolume()->getNumVolumeFaces() << " drawable face count " << mDrawable->getNumFaces() << LL_ENDL;
LLVOAvatar* root = getAvatar();
if (root)
{
any_valid_boxes = true;
static const LLVector3 PAD_SIZE(.1f, .1f, .1f);
LLVector3 minpos = -PAD_SIZE;
LLVector3 maxpos = PAD_SIZE;
min.load3(minpos.mV,1.f);
max.load3(maxpos.mV, 1.f);
}
}
if (!any_valid_boxes) {
for (S32 i = 0; i < getVolume()->getNumVolumeFaces(); i++)
{
LLFace *face = mDrawable->getFace(i);
@@ -1596,6 +1607,7 @@ BOOL LLVOVolume::genBBoxes(BOOL force_global)
}
}
}
}
if (any_valid_boxes)
{