From 0a411b0b1a89001afbe009c17b5aac70748289c6 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Tue, 3 Dec 2019 17:31:46 +0200
Subject: [PATCH] SL-12374 FIXED [Project Copy/Paste] Normal & specular texture
UUIDs are copied to clipboard from no-copy or no-transfer objects
---
indra/newview/llpanelface.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index da471b0b62d..2aba115e3f3 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -2988,7 +2988,7 @@ void LLPanelFace::onCopyFaces()
// Replace no-copy textures, destination texture will get used instead if available
if (mat_data.has("NormMap"))
{
- LLUUID id = te_data["material"]["NormMap"].asUUID();
+ LLUUID id = mat_data["NormMap"].asUUID();
if (id.notNull() && !LLPanelObject::canCopyTexture(id))
{
mat_data["NormMap"] = LLUUID(gSavedSettings.getString( "DefaultObjectTexture" ));
@@ -2998,7 +2998,7 @@ void LLPanelFace::onCopyFaces()
}
if (mat_data.has("SpecMap"))
{
- LLUUID id = te_data["material"]["SpecMap"].asUUID();
+ LLUUID id = mat_data["SpecMap"].asUUID();
if (id.notNull() && !LLPanelObject::canCopyTexture(id))
{
mat_data["SpecMap"] = LLUUID(gSavedSettings.getString( "DefaultObjectTexture" ));
--
GitLab