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

Merge branch 'future' of https://github.com/Shyotl/SingularityViewer

Browse Source 
Conflicts:
	indra/newview/app_settings/shaders/class2/effects/gaussBlurF.glsl
	indra/newview/llmanipscale.cpp
	indra/newview/llmeshrepository.cpp
	indra/newview/llviewerregion.cpp
	indra/newview/llvovolume.cpp
This commit is contained in:
Siana Gearz
2011-12-24 20:12:12 +01:00
parent 3df853b74b a2fb56bf48
commit fd22d80dfd
528 changed files with 24927 additions and 13128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llpanelobject.cpp
View File

@@ -1414,9 +1414,7 @@ void LLPanelObject::getState( )
U8 sculpt_stitching = sculpt_type & LL_SCULPT_TYPE_MASK;
BOOL sculpt_invert = sculpt_type & LL_SCULPT_FLAG_INVERT;
BOOL sculpt_mirror = sculpt_type & LL_SCULPT_FLAG_MIRROR;
#if MESH_ENABLED
isMesh = (sculpt_stitching == LL_SCULPT_TYPE_MESH);
#endif //MESH_ENABLED
LLTextureCtrl* mTextureCtrl = getChild<LLTextureCtrl>("sculpt texture control");
if(mTextureCtrl)
@@ -2251,9 +2249,7 @@ void LLPanelObject::sendSculpt()
sculpt_type |= mCtrlSculptType->getCurrentIndex();
bool enabled = true;
#if MESH_ENABLED
enabled = sculpt_type != LL_SCULPT_TYPE_MESH;
#endif //MESH_ENABLED
if (mCtrlSculptMirror)
{