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

#4027 Crash at adjustTexturesByScale

meow-7.2.2
Andrey Kleshchev 2025-05-05 19:38:07 +03:00 committed by Andrey Kleshchev
parent 929c9b2dd0
commit fe0a4f44cf
1 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
indra/newview/llselectmgr.cpp
View File

@ -3142,36 +3142,43 @@ void LLSelectMgr::adjustTexturesByScale(bool send_to_sim, bool stretch)
F32 offset_x = 0;
F32 offset_y = 0;
for (U32 i = 0; i < LLGLTFMaterial::GLTF_TEXTURE_INFO_COUNT; ++i)
if (te_num < selectNode->mGLTFScaleRatios.size())
{
LLVector3 scale_ratio = selectNode->mGLTFScaleRatios[te_num][i];
for (U32 i = 0; i < LLGLTFMaterial::GLTF_TEXTURE_INFO_COUNT; ++i)
{
LLVector3 scale_ratio = selectNode->mGLTFScaleRatios[te_num][i];
if (planar)
{
scale_x = scale_ratio.mV[s_axis] / object_scale.mV[s_axis];
scale_y = scale_ratio.mV[t_axis] / object_scale.mV[t_axis];
}
else
{
scale_x = scale_ratio.mV[s_axis] * object_scale.mV[s_axis];
scale_y = scale_ratio.mV[t_axis] * object_scale.mV[t_axis];
}
material->mTextureTransform[i].mScale.set(scale_x, scale_y);
if (planar)
{
scale_x = scale_ratio.mV[s_axis] / object_scale.mV[s_axis];
scale_y = scale_ratio.mV[t_axis] / object_scale.mV[t_axis];
}
else
{
scale_x = scale_ratio.mV[s_axis] * object_scale.mV[s_axis];
scale_y = scale_ratio.mV[t_axis] * object_scale.mV[t_axis];
}
material->mTextureTransform[i].mScale.set(scale_x, scale_y);
LLVector2 scales = selectNode->mGLTFScales[te_num][i];
LLVector2 offsets = selectNode->mGLTFOffsets[te_num][i];
F64 int_part = 0;
offset_x = (F32)modf((offsets[VX] + (scales[VX] - scale_x)) / 2, &int_part);
if (offset_x < 0)
{
offset_x++;
LLVector2 scales = selectNode->mGLTFScales[te_num][i];
LLVector2 offsets = selectNode->mGLTFOffsets[te_num][i];
F64 int_part = 0;
offset_x = (F32)modf((offsets[VX] + (scales[VX] - scale_x)) / 2, &int_part);
if (offset_x < 0)
{
offset_x++;
}
offset_y = (F32)modf((offsets[VY] + (scales[VY] - scale_y)) / 2, &int_part);
if (offset_y < 0)
{
offset_y++;
}
material->mTextureTransform[i].mOffset.set(offset_x, offset_y);
}
offset_y = (F32)modf((offsets[VY] + (scales[VY] - scale_y)) / 2, &int_part);
if (offset_y < 0)
{
offset_y++;
}
material->mTextureTransform[i].mOffset.set(offset_x, offset_y);
}
else
{
llassert(false); // make sure mGLTFScaleRatios is filled
}
const LLGLTFMaterial* base_material = tep->getGLTFMaterial();
@ -6927,7 +6934,6 @@ void LLSelectNode::saveTextureScaleRatios(LLRender::eTexIndex index_to_query)
if (mObject.notNull())
{
LLVector3 scale = mObject->getScale();
for (U8 i = 0; i < mObject->getNumTEs(); i++)