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

1024*1024 baking viewer updates

master
Anchor 2017-09-06 03:24:58 -07:00
parent 33ef63f3ed
commit 8c7edbef18
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llappearance/llavatarappearancedefines.cpp
View File

@ -27,8 +27,8 @@
#include "linden_common.h"
#include "llavatarappearancedefines.h"
const S32 LLAvatarAppearanceDefines::SCRATCH_TEX_WIDTH = 512;
const S32 LLAvatarAppearanceDefines::SCRATCH_TEX_HEIGHT = 512;
const S32 LLAvatarAppearanceDefines::SCRATCH_TEX_WIDTH = 1024;
const S32 LLAvatarAppearanceDefines::SCRATCH_TEX_HEIGHT = 1024;
const S32 LLAvatarAppearanceDefines::IMPOSTOR_PERIOD = 2;
using namespace LLAvatarAppearanceDefines;

20
indra/newview/character/avatar_lad.xml
View File

@ -8923,8 +8923,8 @@
<!-- =========================================================== -->
<layer_set
body_region="hair"
width="512"
height="512"
width="1024"
height="1024"
clear_alpha="false">
<layer
name="base"
@ -8953,8 +8953,8 @@
<layer_set
body_region="head"
width="512"
height="512">
width="1024"
height="1024">
<layer
name="head bump base"
fixed_color = "128,128,128,255"
@ -10031,8 +10031,8 @@ render_pass="bump">
<!-- =========================================================== -->
<layer_set
body_region="upper_body"
width="512"
height="512">
width="1024"
height="1024">
<layer
name="base_upperbody bump"
render_pass="bump"
@ -11282,8 +11282,8 @@ render_pass="bump">
<!-- =========================================================== -->
<layer_set
body_region="lower_body"
width="512"
height="512">
width="1024"
height="1024">
<layer
name="lower body bump base"
fixed_color = "128,128,128,255"
@ -12241,8 +12241,8 @@ render_pass="bump">
<!-- =========================================================== -->
<layer_set
body_region="skirt"
width="512"
height="512"
width="1024"
height="1024"
clear_alpha="false">
<layer
name="skirt_fabric"

4
indra/newview/lldynamictexture.cpp
View File

@ -126,8 +126,8 @@ BOOL LLViewerDynamicTexture::render()
void LLViewerDynamicTexture::preRender(BOOL clear_depth)
{
//only images up to 512x512 are supported
llassert(mFullHeight <= 512);
llassert(mFullWidth <= 512);
//llassert(mFullHeight <= 512);
//llassert(mFullWidth <= 512);
if (gGLManager.mHasFramebufferObject && gPipeline.mWaterDis.isComplete() && !gGLManager.mIsATI)
{ //using offscreen render target, just use the bottom left corner