diff options
| author | Marius Kintel <marius@kintel.net> | 2011-08-02 21:48:13 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-08-02 21:48:13 (GMT) |
| commit | c65a3f5d743a75b1e4adc0da46b13a2cf8998def (patch) | |
| tree | aa96b98437c9653a2a5dc5ed30718497d1a4b01a /patches/OpenCSG-1.3.0-MacOSX-port.patch | |
| parent | cacfbd94b92e02c30b48b458eb4cf90563457724 (diff) | |
| parent | e8dac70bcd2d950a36baf522113ac9ce0a50c724 (diff) | |
Merge branch 'master' into visitor
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; }; |