diff options
| author | Timothy Gu <timothygu99@gmail.com> | 2015-10-15 18:38:46 (GMT) |
|---|---|---|
| committer | Timothy Gu <timothygu99@gmail.com> | 2015-10-15 18:38:46 (GMT) |
| commit | abe8bc23e97c3309400b071bf19e105ed9d918ec (patch) | |
| tree | 6a838aafb670bd969cc450559208635b85d3e0a5 /src | |
| parent | f700285a10119da6fa6a389e0e53f4fd00a83997 (diff) | |
| parent | 2c44a78f0f7d8d5284dda0cc952b10250f107af4 (diff) | |
| download | mxe-abe8bc23e97c3309400b071bf19e105ed9d918ec.zip mxe-abe8bc23e97c3309400b071bf19e105ed9d918ec.tar.gz mxe-abe8bc23e97c3309400b071bf19e105ed9d918ec.tar.bz2 | |
Merge pull request #936 from saiarcot895/upstream-fix-osg-patch
Fix OpenSceneGraph patch.
Diffstat (limited to 'src')
| -rw-r--r-- | src/openscenegraph-3-fix-pointer-to-int-conversion-on-64bit.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/openscenegraph-3-fix-pointer-to-int-conversion-on-64bit.patch b/src/openscenegraph-3-fix-pointer-to-int-conversion-on-64bit.patch index 6e0a6b4..835cf6f 100644 --- a/src/openscenegraph-3-fix-pointer-to-int-conversion-on-64bit.patch +++ b/src/openscenegraph-3-fix-pointer-to-int-conversion-on-64bit.patch @@ -14,7 +14,7 @@ diff --git a/src/osgPlugins/osgjs/WriteVisitor.cpp b/src/osgPlugins/osgjs/WriteV index 9f2b3c7..98e0c19 100644 --- a/src/osgPlugins/osgjs/WriteVisitor.cpp +++ b/src/osgPlugins/osgjs/WriteVisitor.cpp -@@ -225,8 +225,7 @@ JSONObject* createImage(osg::Image* image, bool inlineImages, int maxTextureDime +@@ -225,7 +225,7 @@ JSONObject* createImage(osg::Image* image, bool inlineImages, int maxTextureDime // no image file so use this inline name image and create a file std::stringstream ss; ss << osgDB::getFilePath(baseName) << osgDB::getNativePathSeparator(); |