Merge pull request #119 from LaurensVoerman/Submissions2c

Fixed clone osgVolume::Scalarproperty and osg::TextureBuffer crash
2016-09-02 17:47:37 +01:00
parent 14bdadaf86 d0020b7dfc
commit c19b271586
2 changed files with 4 additions and 2 deletions
--- a/src/osg/TextureBuffer.cpp
+++ b/src/osg/TextureBuffer.cpp
@@ -35,7 +35,9 @@ TextureBuffer::TextureBuffer(const TextureBuffer& text,const CopyOp& copyop):
    Texture(text,copyop),
    _textureWidth(text._textureWidth)
 {
-    setBufferData(osg::clone(text._bufferData.get(), copyop));
+    if (text._bufferData.valid()) {
+        setBufferData(osg::clone(text._bufferData.get(), copyop));
+    }
 }

 TextureBuffer::~TextureBuffer()