From d66ee2c698c1ed8eafa90ee93754632cb4ada5fe Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Thu, 6 Jun 2013 08:23:37 +0000
Subject: [PATCH] Replaced OpenThreads::Mutex with a
 OpenThreads::ReentrantMutex to allow draw callbacks to use Renderer.

---
 src/osgViewer/Renderer.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/osgViewer/Renderer.cpp b/src/osgViewer/Renderer.cpp
index c87b29d4b..f80f9ed2e 100644
--- a/src/osgViewer/Renderer.cpp
+++ b/src/osgViewer/Renderer.cpp
@@ -14,6 +14,7 @@
 #include <stdio.h>
 
 #include <osg/GLExtensions>
+#include <OpenThreads/ReentrantMutex>
 
 #include <osgUtil/Optimizer>
 #include <osgUtil/GLObjectsVisitor>
@@ -344,7 +345,7 @@ void Renderer::ThreadSafeQueue::add(osgUtil::SceneView* sv)
     _cond.broadcast();
 }
 
-static OpenThreads::Mutex s_drawSerializerMutex;
+static OpenThreads::ReentrantMutex s_drawSerializerMutex;
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 //
@@ -852,7 +853,7 @@ void Renderer::cull_draw()
 
     if (_serializeDraw)
     {
-        OpenThreads::ScopedLock<OpenThreads::Mutex> lock(s_drawSerializerMutex);
+        OpenThreads::ScopedLock<OpenThreads::ReentrantMutex> lock(s_drawSerializerMutex);
 
         beforeDrawTick = osg::Timer::instance()->tick();
         sceneView->draw();