Changeset 9869 in orxonox.OLD for trunk/src/world_entities/environments/mapped_water.h

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

• trunk/src/world_entities/environments/mapped_water.h (modified) (2 diffs)

trunk/src/world_entities/environments/mapped_water.h

@@ -35 +35 @@
 class MappedWater : public WorldEntity
 {
+  ObjectListDeclaration(MappedWater);
 public:
   MappedWater(const TiXmlElement* root = NULL);
@@ -106 +107 @@
 private:
   Material                  mat;
-  Shader*                   shader;
+  Shader                    shader;
   OrxGui::GLGuiBox*         box;