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

Minor bit of cleanup. Also now using glTexGenf instead of glTexGeni for fixed-function water texcoords.

Browse Source
This commit is contained in:
Shyotl
2013-02-25 13:02:22 -06:00
parent e187e642c0
commit d27b329afb
4 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
indra/llcommon/llmemtype.h
View File

@@ -40,7 +40,6 @@
#include <vector>
#define MEM_TYPE_NEW(T)
class LL_COMMON_API LLMemType
{

1
indra/newview/lldrawable.h
View File

@@ -93,7 +93,6 @@ public:
}
LLDrawable() { init(); }
MEM_TYPE_NEW(LLMemType::MTYPE_DRAWABLE);
void markDead(); // Mark this drawable as dead
BOOL isDead() const { return isState(DEAD); }

4
indra/newview/lldrawpoolwater.cpp
View File

@@ -414,8 +414,8 @@ void LLDrawPoolWater::renderOpaqueLegacyWater()
{
glEnable(GL_TEXTURE_GEN_S); //texture unit 0
glEnable(GL_TEXTURE_GEN_T); //texture unit 0
glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_OBJECT_LINEAR);
glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_OBJECT_LINEAR);
glTexGenf(GL_S, GL_TEXTURE_GEN_MODE, GL_OBJECT_LINEAR);
glTexGenf(GL_T, GL_TEXTURE_GEN_MODE, GL_OBJECT_LINEAR);
}
// Use the fact that we know all water faces are the same size

1
indra/newview/llviewerobject.h
View File

@@ -133,7 +133,6 @@ public:
typedef const child_list_t const_child_list_t;
LLViewerObject(const LLUUID &id, const LLPCode type, LLViewerRegion *regionp, BOOL is_global = FALSE);
MEM_TYPE_NEW(LLMemType::MTYPE_OBJECT);
virtual void markDead(); // Mark this object as dead, and clean up its references
BOOL isDead() const {return mDead;}