Added explicit initialization of osg::Referenced(true) to osg::Operation subclasses as it uses virtual inhertiance from osg::Referenced.

git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/branches/OpenSceneGraph-3.4@15024 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield
2015-07-23 15:46:39 +00:00
parent 42efcf24fb
commit 761cf52bb7
16 changed files with 21 additions and 4 deletions

View File

@@ -98,6 +98,7 @@ void ReleaseContext_Block_MakeCurrentOperation::operator () (GraphicsContext* co
BlockAndFlushOperation::BlockAndFlushOperation():
osg::Referenced(true),
GraphicsOperation("Block",false)
{
reset();
@@ -115,6 +116,7 @@ void BlockAndFlushOperation::operator () (GraphicsContext*)
}
FlushDeletedGLObjectsOperation::FlushDeletedGLObjectsOperation(double availableTime, bool keep):
osg::Referenced(true),
GraphicsOperation("FlushDeletedGLObjectsOperation",keep),
_availableTime(availableTime)
{

View File

@@ -22,6 +22,7 @@ using namespace OpenThreads;
struct BlockOperation : public Operation, public Block
{
BlockOperation():
osg::Referenced(true),
Operation("Block",false)
{
reset();

View File

@@ -181,12 +181,14 @@ void GLObjectsVisitor::apply(osg::StateSet& stateset)
//
GLObjectsOperation::GLObjectsOperation(GLObjectsVisitor::Mode mode):
osg::Referenced(true),
osg::GraphicsOperation("GLObjectOperation",false),
_mode(mode)
{
}
GLObjectsOperation::GLObjectsOperation(osg::Node* subgraph, GLObjectsVisitor::Mode mode):
osg::Referenced(true),
osg::GraphicsOperation("GLObjectOperation",false),
_subgraph(subgraph),
_mode(mode)

View File

@@ -445,6 +445,7 @@ bool IncrementalCompileOperation::CompileSet::compile(CompileInfo& compileInfo)
// IncrementalCompileOperation
//
IncrementalCompileOperation::IncrementalCompileOperation():
osg::Referenced(true),
osg::GraphicsOperation("IncrementalCompileOperation",true),
_flushTimeRatio(0.5),
_conservativeTimeRatio(0.5),

View File

@@ -1122,6 +1122,7 @@ void RenderStage::drawInner(osg::RenderInfo& renderInfo,RenderLeaf*& previous, b
struct DrawInnerOperation : public osg::Operation
{
DrawInnerOperation(RenderStage* stage, osg::RenderInfo& renderInfo) :
osg::Referenced(true),
osg::Operation("DrawInnerStage",false),
_stage(stage),
_renderInfo(renderInfo) {}

View File

@@ -352,6 +352,7 @@ static OpenThreads::ReentrantMutex s_drawSerializerMutex;
//
// Renderer
Renderer::Renderer(osg::Camera* camera):
osg::Referenced(true),
osg::GraphicsOperation("Renderer",true),
_camera(camera),
_done(false),