Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
KennethVanhoey
CGoGN
Commits
e7cd2254
Commit
e7cd2254
authored
Nov 17, 2014
by
Sylvain Thery
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' of /home/git/repositories/cgogn/cgogn
parents
298bb571
65df6922
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
SCHNApps/src/schnapps.cpp
SCHNApps/src/schnapps.cpp
+1
-1
No files found.
SCHNApps/src/schnapps.cpp
View file @
e7cd2254
...
@@ -47,7 +47,7 @@ SCHNApps::SCHNApps(const QString& appPath, PythonQtObjectPtr& pythonContext, Pyt
...
@@ -47,7 +47,7 @@ SCHNApps::SCHNApps(const QString& appPath, PythonQtObjectPtr& pythonContext, Pyt
#ifdef USE_OGL_CORE_PROFILE
#ifdef USE_OGL_CORE_PROFILE
CGoGN
::
Utils
::
GLSLShader
::
setCurrentOGLVersion
(
3
);
CGoGN
::
Utils
::
GLSLShader
::
setCurrentOGLVersion
(
3
);
#else
#else
CGoGN
::
Utils
::
GLSLShader
::
setCurrentOGLVersion
(
3
);
CGoGN
::
Utils
::
GLSLShader
::
setCurrentOGLVersion
(
2
);
#endif
#endif
this
->
setupUi
(
this
);
this
->
setupUi
(
this
);
...
...
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