rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-18 03:52:11 +01:00
Code Issues Releases Activity

LP-222 hotfix: osg 3.4 was updated and LP patch for osg needs to be modified to reflect that

Browse Source
This commit is contained in:
Philippe Renon 2016-01-27 21:38:16 +01:00
parent da884f5432
commit e5685dcfa6
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
make/3rdparty/osgearth/osg-3.4.patch vendored
View File

@ -10,19 +10,6 @@ index a62157e..75adfba 100644
_name(op._name), _name(op._name),
_keep(op._keep) {} _keep(op._keep) {}
diff --git a/include/osgViewer/View b/include/osgViewer/View
index 472b489..07ef9ce 100644
--- a/include/osgViewer/View
+++ b/include/osgViewer/View
@@ -127,7 +127,7 @@ class OSGVIEWER_EXPORT View : public osg::View, public osgGA::GUIActionAdapter
/** Set the View's image pager.*/
void setImagePager(osgDB::ImagePager* ip);
- template<class T> void setImagePager(const osg::ref_ptr<T>* ip) { setImagePager(ip.get()); }
+ template<class T> void setImagePager(const osg::ref_ptr<T>& ip) { setImagePager(ip.get()); }
/** Get the View's image pager.*/
osgDB::ImagePager* getImagePager();
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 33edf57..d2ea025 100644 index 33edf57..d2ea025 100644
--- a/src/CMakeLists.txt --- a/src/CMakeLists.txt