Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
CGoGN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
CGoGN
CGoGN
Commits
c0ee9030
Commit
c0ee9030
authored
Dec 20, 2011
by
Sylvain Thery
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Modify shaders that use texture do not compile if not using Qt
parent
07db9767
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
0 deletions
+10
-0
src/Utils/Shaders/shaderSimpleTexture.cpp
src/Utils/Shaders/shaderSimpleTexture.cpp
+5
-0
src/Utils/Shaders/shaderTextureMask.cpp
src/Utils/Shaders/shaderTextureMask.cpp
+5
-0
No files found.
src/Utils/Shaders/shaderSimpleTexture.cpp
View file @
c0ee9030
...
@@ -22,6 +22,8 @@
...
@@ -22,6 +22,8 @@
* *
* *
*******************************************************************************/
*******************************************************************************/
#ifdef WITH_QT
#include <GL/glew.h>
#include <GL/glew.h>
#include "Utils/Shaders/shaderSimpleTexture.h"
#include "Utils/Shaders/shaderSimpleTexture.h"
...
@@ -114,3 +116,6 @@ void ShaderSimpleTexture::restoreUniformsAttribs()
...
@@ -114,3 +116,6 @@ void ShaderSimpleTexture::restoreUniformsAttribs()
}
// namespace Utils
}
// namespace Utils
}
// namespace CGoGN
}
// namespace CGoGN
#else
#pragma message(__FILE__ " not compiled because of mising Qt")
#endif
src/Utils/Shaders/shaderTextureMask.cpp
View file @
c0ee9030
...
@@ -21,6 +21,7 @@
...
@@ -21,6 +21,7 @@
* Contact information: cgogn@unistra.fr *
* Contact information: cgogn@unistra.fr *
* *
* *
*******************************************************************************/
*******************************************************************************/
#ifdef WITH_QT
#include <GL/glew.h>
#include <GL/glew.h>
#include "Utils/Shaders/shaderTextureMask.h"
#include "Utils/Shaders/shaderTextureMask.h"
...
@@ -127,3 +128,7 @@ void ShaderTextureMask::restoreUniformsAttribs()
...
@@ -127,3 +128,7 @@ void ShaderTextureMask::restoreUniformsAttribs()
}
// namespace Utils
}
// namespace Utils
}
// namespace CGoGN
}
// namespace CGoGN
#else
#pragma message(__FILE__ " not compiled because of mising Qt")
#endif
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment