FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #119 from LaurensVoerman/Submissions2c

Browse Source 
Fixed clone osgVolume::Scalarproperty and osg::TextureBuffer crash
This commit is contained in:
OpenSceneGraph git repository 2016-09-02 17:47:37 +01:00 committed by GitHub
commit c19b271586
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/osg/TextureBuffer.cpp
View File

@ -35,8 +35,10 @@ TextureBuffer::TextureBuffer(const TextureBuffer& text,const CopyOp& copyop):
Texture(text,copyop), Texture(text,copyop),
_textureWidth(text._textureWidth) _textureWidth(text._textureWidth)
{ {
if (text._bufferData.valid()) {
setBufferData(osg::clone(text._bufferData.get(), copyop)); setBufferData(osg::clone(text._bufferData.get(), copyop));
} }
}
TextureBuffer::~TextureBuffer() TextureBuffer::~TextureBuffer()
{ {

2
src/osgVolume/Property.cpp
View File

@ -102,7 +102,7 @@ ScalarProperty::ScalarProperty(const std::string& scalarName, float value)
ScalarProperty::ScalarProperty(const ScalarProperty& sp, const osg::CopyOp& copyop): ScalarProperty::ScalarProperty(const ScalarProperty& sp, const osg::CopyOp& copyop):
Property(sp,copyop) Property(sp,copyop)
{ {
_uniform = new osg::Uniform(sp._uniform->getName().c_str(), getValue()); _uniform = new osg::Uniform(*sp._uniform.get(), copyop);
} }