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

SL-13821 Fix upload options affecting preview options incorrectly

meow-7.2.2
Andrey Kleshchev 2020-08-19 23:26:44 +03:00
parent b0274e1bdd
commit 0ee7e9dadb
1 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
indra/newview/llfloatermodelpreview.cpp
View File

@ -346,11 +346,37 @@ void LLFloaterModelPreview::onUploadOptionChecked(LLUICtrl* ctrl)
if (mModelPreview)
{
auto name = ctrl->getName();
bool value = ctrl->getValue().asBoolean();
// update the option and notifications
// (this is a bit convoluted, because of the current structure of mModelPreview)
// FIX ME! mViewOption is malfunctioning here! mViewOption doesn't have values like "upload_skin"!
// This needs to translate values like "upload_skin" into "show_skin_weights"
mModelPreview->mViewOption[name] = !mModelPreview->mViewOption[name];
if (name == "upload_skin")
{
childSetValue("show_skin_weight", value);
mModelPreview->mViewOption["show_skin_weight"] = value;
if (!value)
{
mModelPreview->mViewOption["show_joint_overrides"] = false;
mModelPreview->mViewOption["show_joint_positions"] = false;
}
}
else if (name == "upload_joints")
{
if (mModelPreview->mViewOption["show_skin_weight"])
{
childSetValue("show_joint_overrides", value);
mModelPreview->mViewOption["show_joint_overrides"] = value;
}
}
else if (name == "upload_textures")
{
childSetValue("show_textures", value);
mModelPreview->mViewOption["show_textures"] = value;
}
else if (name == "lock_scale_if_joint_position")
{
mModelPreview->mViewOption["lock_scale_if_joint_position"] = value;
}
mModelPreview->refresh(); // a 'dirty' flag for render
mModelPreview->resetPreviewTarget();
mModelPreview->clearBuffers();