Changeset 8758 in orxonox.OLD for branches/fontdata/src/lib/graphics/importer/texture.cc

Timestamp:

Jun 23, 2006, 10:20:35 PM (18 years ago)

Author:

bensch

Message:

font is a Material now

File:

• branches/fontdata/src/lib/graphics/importer/texture.cc (modified) (2 diffs)

branches/fontdata/src/lib/graphics/importer/texture.cc

@@ -151 +151 @@
   this->setClassID(CL_TEXTURE, "Texture");
 
-  this->data = CountPointer<TextureData>(new TextureData());
+  this->data = TextureDataPointer(new TextureData());
 
   this->priority = 0.5;
@@ -173 +173 @@
   this->data = texture.data;
 
+  return *this;
+}
+
+Texture& Texture::operator=(const TextureDataPointer& textureDataPointer)
+{
+  this->data = textureDataPointer;
   return *this;
 }