Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'animesh' of git://github.com/Shyotl/SingularityViewer into animesh

Browse Source 
# Conflicts:
#	indra/llcommon/llindexedvector.h
This commit is contained in:
Liru Færs
2019-08-15 20:50:36 -04:00
parent 5eef36c47a 5c156a9d86
commit 1b52b3e685
39 changed files with 437 additions and 604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llviewermenu.cpp
View File

@@ -2189,7 +2189,7 @@ public:
LLVOVolume* volume = (*(img->getVolumeList()))[i];
if (volume && volume->isSculpted())
{
LLSculptParams *sculpt_params = (LLSculptParams *)volume->getParameterEntry(LLNetworkData::PARAMS_SCULPT);
const LLSculptParams *sculpt_params = volume->getSculptParams();
if(sculpt_params->getSculptTexture() == id)
volume->notifyMeshLoaded();
}
@@ -2226,7 +2226,7 @@ void reload_objects(LLTextureReloader& texture_list, LLViewerObject::const_child
if(object->isSculpted() && !object->isMesh())
{
LLSculptParams *sculpt_params = (LLSculptParams *)object->getParameterEntry(LLNetworkData::PARAMS_SCULPT);
const LLSculptParams *sculpt_params = object->getSculptParams();
if(sculpt_params)
{
texture_list.addTexture(LLViewerTextureManager::getFetchedTexture(sculpt_params->getSculptTexture()));