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:
@@ -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)
|
||||
{
|
||||
|
||||
@@ -22,6 +22,7 @@ using namespace OpenThreads;
|
||||
struct BlockOperation : public Operation, public Block
|
||||
{
|
||||
BlockOperation():
|
||||
osg::Referenced(true),
|
||||
Operation("Block",false)
|
||||
{
|
||||
reset();
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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),
|
||||
|
||||
@@ -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) {}
|
||||
|
||||
@@ -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),
|
||||
|
||||
Reference in New Issue
Block a user