From 8c7edbef183e284186da583c4c9b55fe2bc972d1 Mon Sep 17 00:00:00 2001
From: Anchor <none@none>
Date: Wed, 6 Sep 2017 03:24:58 -0700
Subject: [PATCH] 1024*1024 baking viewer updates
---
.../llavatarappearancedefines.cpp | 4 ++--
indra/newview/character/avatar_lad.xml | 20 +++++++++----------
indra/newview/lldynamictexture.cpp | 4 ++--
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/indra/llappearance/llavatarappearancedefines.cpp b/indra/llappearance/llavatarappearancedefines.cpp
index f1c78946a11..17da19a7104 100644
--- a/indra/llappearance/llavatarappearancedefines.cpp
+++ b/indra/llappearance/llavatarappearancedefines.cpp
@@ -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;
diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml
index 90f06746c9f..ee620b39b8c 100644
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -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"
diff --git a/indra/newview/lldynamictexture.cpp b/indra/newview/lldynamictexture.cpp
index fa9a0712fa4..800c36f911d 100644
--- a/indra/newview/lldynamictexture.cpp
+++ b/indra/newview/lldynamictexture.cpp
@@ -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
--
GitLab