diff options
| author | maxim_productengine <mnikolenko@productengine.com> | 2019-12-09 17:26:16 +0200 |
|---|---|---|
| committer | maxim_productengine <mnikolenko@productengine.com> | 2019-12-09 17:26:16 +0200 |
| commit | b3d57f93b6c445578ea3f4caf596472f4ee6fa43 (patch) | |
| tree | 184a5dc7cacbd7ff63529509424f0b8853547eff /indra | |
| parent | 0a411b0b1a89001afbe009c17b5aac70748289c6 (diff) | |
SL-12413 FIXED [Project Copy/Paste] Bumpiness/Shininess parameters are not pasted from the clipboard
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llpanelface.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index 2aba115e3f..3a48db0a1a 100644 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -2916,6 +2916,9 @@ void LLPanelFace::onCopyFaces() te_data["te"] = tep->asLLSD(); te_data["te"]["glow"] = tep->getGlow(); te_data["te"]["shiny"] = tep->getShiny(); + te_data["te"]["bumpmap"] = tep->getBumpmap(); + te_data["te"]["bumpshiny"] = tep->getBumpShiny(); + te_data["te"]["bumpfullbright"] = tep->getBumpShinyFullbright(); if (te_data["te"].has("imageid")) { @@ -3156,6 +3159,19 @@ void LLPanelFace::pasteFace(LLViewerObject* objectp, S32 te) objectp->setTEGlow(te, (F32)te_data["te"]["glow"].asReal()); } + if (mPasteNormal && te_data["te"].has("bumpmap")) + { + objectp->setTEBumpmap(te, (U8)te_data["te"]["bumpmap"].asInteger()); + } + if (mPasteSpecular && te_data["te"].has("bumpshiny")) + { + objectp->setTEBumpShiny(te, (U8)te_data["te"]["bumpshiny"].asInteger()); + } + if (mPasteSpecular && te_data["te"].has("bumpfullbright")) + { + objectp->setTEBumpShinyFullbright(te, (U8)te_data["te"]["bumpfullbright"].asInteger()); + } + // Texture map if (mPasteMapping) { |