Merge branch 'master' into text_improvements

2017-10-20 14:14:14 +01:00
parent 0e39c129b7 38e5fdadf0
commit 6b75439ae4
25 changed files with 622 additions and 138 deletions
--- a/examples/osgSSBO/osgSSBO.cpp
+++ b/examples/osgSSBO/osgSSBO.cpp
@@ -772,7 +772,7 @@ void ComputeNode::initComputingSetup()
    _dataArray->setBufferObject(_ssbo.get());


-    _ssbb = new osg::ShaderStorageBufferBinding(0, _dataArray, 0, blockSize);
+    _ssbb = new osg::ShaderStorageBufferBinding(0, _dataArray.get(), 0, blockSize);
    statesetComputation->setAttributeAndModes(_ssbb.get(), osg::StateAttribute::ON);