diff options
| author | Don Bright <hugh.m.bright@gmail.com> | 2011-08-03 21:37:51 (GMT) |
|---|---|---|
| committer | Don Bright <hugh.m.bright@gmail.com> | 2011-08-03 21:37:51 (GMT) |
| commit | f78d4f74b2606f3cccff0f241b608cb021a30b9b (patch) | |
| tree | 6d61969163630b4ac88011eddb1894c65d768c78 /patches/OpenCSG-1.3.0-MacOSX-port.patch | |
| parent | 5aec712746eeac2e3bdf2501a7473bcac9777690 (diff) | |
| parent | a35c801eec98803bf21d0d6c8d2748f0d9ccd507 (diff) | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'patches/OpenCSG-1.3.0-MacOSX-port.patch')
| -rw-r--r-- | patches/OpenCSG-1.3.0-MacOSX-port.patch | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/patches/OpenCSG-1.3.0-MacOSX-port.patch b/patches/OpenCSG-1.3.0-MacOSX-port.patch index bb55165..e8eaa92 100644 --- a/patches/OpenCSG-1.3.0-MacOSX-port.patch +++ b/patches/OpenCSG-1.3.0-MacOSX-port.patch @@ -1102,7 +1102,7 @@ diff -ru OpenCSG-1.3.0/src/channelManager.cpp OpenCSG-1.3.0-mac/src/channelManag diff -ru OpenCSG-1.3.0/src/frameBufferObject.h OpenCSG-1.3.0-mac/src/frameBufferObject.h --- OpenCSG-1.3.0/src/frameBufferObject.h 2010-02-06 21:35:10.000000000 +0100 +++ OpenCSG-1.3.0-mac/src/frameBufferObject.h 2010-05-09 02:51:36.000000000 +0200 -@@ -79,10 +79,10 @@ +@@ -79,11 +79,11 @@ /// Texture stuff GLenum textureTarget; @@ -1112,7 +1112,9 @@ diff -ru OpenCSG-1.3.0/src/frameBufferObject.h OpenCSG-1.3.0-mac/src/frameBuffer + GLuint depthID; - unsigned int framebufferID; +- int oldFramebufferID; + GLuint framebufferID; ++ GLint oldFramebufferID; bool initialized; }; |