SF.net SVN: openvrml:[4156] trunk

[<br...@us...>]

Revision: 4156
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4156&view=rev
Author:   braden
Date:     2010-07-09 06:37:09 +0000 (Fri, 09 Jul 2010)

Log Message:
-----------
Lock the image_mutex_ before rendering the texture.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/node/vrml97/image_texture.cpp

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-06-06 19:11:18 UTC (rev 4155)
+++ trunk/ChangeLog	2010-07-09 06:37:09 UTC (rev 4156)
@@ -1,3 +1,9 @@
+2010-07-09 Braden McDaniel  <br...@en...>
+
+	* src/node/vrml97/image_texture.cpp
+	(image_texture_node::do_render_texture(openvrml::viewer &)): Lock
+	the image_mutex_ before rendering the texture.
+
 2010-06-06 Braden McDaniel  <br...@en...>
 
 	* src/libopenvrml/openvrml/x3d_vrml_grammar.h: Added MFDouble

Modified: trunk/src/node/vrml97/image_texture.cpp
===================================================================
--- trunk/src/node/vrml97/image_texture.cpp	2010-06-06 19:11:18 UTC (rev 4155)
+++ trunk/src/node/vrml97/image_texture.cpp	2010-07-09 06:37:09 UTC (rev 4156)
@@ -230,6 +230,7 @@
     void image_texture_node::do_render_texture(openvrml::viewer & v)
     {
         this->update_texture();
+        boost::shared_lock<boost::shared_mutex> lock(this->image_mutex_);
         v.insert_texture(*this, true);
     }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.