Skip to content
Snippets Groups Projects
Commit b3d57f93 authored by maxim_productengine's avatar maxim_productengine
Browse files

SL-12413 FIXED [Project Copy/Paste] Bumpiness/Shininess parameters are not...

SL-12413 FIXED [Project Copy/Paste] Bumpiness/Shininess parameters are not pasted from the clipboard
parent 0a411b0b
No related branches found
No related tags found
1 merge request!83Merge Linden 6.6.7
...@@ -2916,6 +2916,9 @@ void LLPanelFace::onCopyFaces() ...@@ -2916,6 +2916,9 @@ void LLPanelFace::onCopyFaces()
te_data["te"] = tep->asLLSD(); te_data["te"] = tep->asLLSD();
te_data["te"]["glow"] = tep->getGlow(); te_data["te"]["glow"] = tep->getGlow();
te_data["te"]["shiny"] = tep->getShiny(); 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")) if (te_data["te"].has("imageid"))
{ {
...@@ -3156,6 +3159,19 @@ void LLPanelFace::pasteFace(LLViewerObject* objectp, S32 te) ...@@ -3156,6 +3159,19 @@ void LLPanelFace::pasteFace(LLViewerObject* objectp, S32 te)
objectp->setTEGlow(te, (F32)te_data["te"]["glow"].asReal()); 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 // Texture map
if (mPasteMapping) if (mPasteMapping)
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment