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

Fix linker errors on linux after merging Shyotl

Browse Source
This commit is contained in:
Lirusaito
2014-07-22 04:24:26 -04:00
parent 41eb687243
commit 30e76a7c11
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/pipeline.cpp
View File

@@ -249,12 +249,12 @@ void drawBoxOutline(const LLVector3& pos, const LLVector3& size);
U32 nhpo2(U32 v); U32 nhpo2(U32 v);
LLVertexBuffer* ll_create_cube_vb(U32 type_mask, U32 usage); LLVertexBuffer* ll_create_cube_vb(U32 type_mask, U32 usage);
inline const LLMatrix4a& glh_get_current_modelview() const LLMatrix4a& glh_get_current_modelview()
{ {
return gGLModelView; return gGLModelView;
} }
inline const LLMatrix4a& glh_get_current_projection() const LLMatrix4a& glh_get_current_projection()
{ {
return gGLProjection; return gGLProjection;
} }
@@ -269,12 +269,12 @@ inline const LLMatrix4a& glh_get_last_projection()
return gGLLastProjection; return gGLLastProjection;
} }
inline void glh_set_current_modelview(const LLMatrix4a& mat) void glh_set_current_modelview(const LLMatrix4a& mat)
{ {
gGLModelView = mat; gGLModelView = mat;
} }
inline void glh_set_current_projection(const LLMatrix4a& mat) void glh_set_current_projection(const LLMatrix4a& mat)
{ {
gGLProjection = mat; gGLProjection = mat;
} }