SF.net SVN: openvrml:[3895] trunk

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

Revision: 3895
          http://openvrml.svn.sourceforge.net/openvrml/?rev=3895&view=rev
Author:   braden
Date:     2009-04-27 05:31:07 +0000 (Mon, 27 Apr 2009)

Log Message:
-----------
openvrml::viewer::insert_texture no longer returns a value.

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-04-27 05:27:33 UTC (rev 3894)
+++ trunk/ChangeLog	2009-04-27 05:31:07 UTC (rev 3895)
@@ -1,5 +1,11 @@
 2009-04-27 Braden McDaniel  <br...@en...>
 
+	* src/node/vrml97/image_texture.cpp
+	(image_texture_node::do_render_texture(openvrml::viewer & v)):
+	openvrml::viewer::insert_texture no longer returns a value.
+
+2009-04-27 Braden McDaniel  <br...@en...>
+
 	* AUTHORS: Removed reference to GIF copyright; OpenVRML hasn't
 	supported GIF for some years.
 

Modified: trunk/src/node/vrml97/image_texture.cpp
===================================================================
--- trunk/src/node/vrml97/image_texture.cpp	2009-04-27 05:27:33 UTC (rev 3894)
+++ trunk/src/node/vrml97/image_texture.cpp	2009-04-27 05:31:07 UTC (rev 3895)
@@ -230,7 +230,7 @@
     void image_texture_node::do_render_texture(openvrml::viewer & v)
     {
         this->update_texture();
-        return v.insert_texture(*this, true);
+        v.insert_texture(*this, true);
     }
 
     /**
@@ -243,11 +243,10 @@
         if (this->texture_needs_update) {
             using openvrml_node_vrml97::image_stream_listener;
             try {
-                if (!this->url_.mfstring::value().empty()) {
+                if (!this->url_.value().empty()) {
                     using std::auto_ptr;
                     auto_ptr<openvrml::resource_istream> in(
-                        this->scene()->get_resource(
-                            this->url_.mfstring::value()));
+                        this->scene()->get_resource(this->url_.value()));
                     auto_ptr<openvrml::stream_listener> listener(
                         new image_stream_listener(in->url(),
                                                   this->image_,


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