Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2010-11-30 20:18:03 +0000
committerStijn Buys <ingar@osirion.org>2010-11-30 20:18:03 +0000
commit12d900b0d943de13950d14a9b0b9ce7fdc7d298f (patch)
tree55192d393eb055997625de99b7bca83ddfb94a0d
parent360e51a9e672e301e2147eb06100f7e68dd74654 (diff)
Correct an OpenGL state change.
-rw-r--r--ChangeLog32
-rwxr-xr-xsrc/ui/modelview.cc2
2 files changed, 22 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index bd0012b..7ea6506 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,7 +6,17 @@
------------------------------------------------------------------
-* release-0.2.0-svn827 (win32 only)
+* build-0.2.0-svn875 "Snowy Patches"
+
+ 2010-10-30
+ src revision 875
+ data revision 525
+
+ - initial support for .map bezier patches
+ - built-in model viewer
+
+
+* build-0.2.0-svn827 (win32 only)
2010-10-16
src revision 827
@@ -14,7 +24,7 @@
- bugfix release for r825
- prevents the win32 client from crashing when VBO's are enabled
-* release-0.2.0-svn825 "November Rain"
+* build-0.2.0-svn825 "November Rain"
2010-10-15
src revision 825
@@ -24,7 +34,7 @@
- scalable models
- world updates and new skyboxes
-* release-0.2.0-svn754 "Broken Skies"
+* build-0.2.0-svn754 "Broken Skies"
2010-10-06
src revision 754
@@ -32,46 +42,46 @@
- replaces skyglobes with skyboxes
-* release-0.1.0-svn740
+* build-0.1.0-svn740
2010-09-26
src revision 740
data revision 441
-* release-0.1.0-svn716
+* build-0.1.0-svn716
2010-03-05
src revision 716
data revision 422
-* release-0.1.0-svn669
+* build-0.1.0-svn669
2009-08-13
src revision 669
data revision 371
-* release-0.1.0-svn641
+* build-0.1.0-svn641
2009-06-28
src revision 641
data revision 326
-* release-0.1.0-svn560
+* build-0.1.0-svn560
src revision 560
data revision 261
-* release-0.1.0-svn523
+* build-0.1.0-svn523
src revision 523
data revision 217
-* release-0.1.0-svn488
+* build-0.1.0-svn488
src revision 488
data revision 174
-* release-0.1.0-svn418
+* build-0.1.0-svn418
src revision 418
data revision 144
diff --git a/src/ui/modelview.cc b/src/ui/modelview.cc
index 8d8adfc..6d4e0e4 100755
--- a/src/ui/modelview.cc
+++ b/src/ui/modelview.cc
@@ -231,7 +231,7 @@ void ModelView::draw()
gl::disable(GL_TEXTURE_2D);
gl::disable(GL_COLOR_MATERIAL); // disable color tracking
gl::disable(GL_CULL_FACE); // disable culling
- gl::depthmask(GL_TRUE); // enable depth buffer writing
+ gl::depthmask(GL_FALSE); // enable depth buffer writing
gl::disable(GL_DEPTH_TEST); // disable depth buffer testing
// gl 2d mode