Changeset 6633 in orxonox.OLD for trunk/src/util/loading/resource_manager.h

Timestamp:

Jan 21, 2006, 1:05:05 AM (18 years ago)

Author:

bensch

Message:

trunk: some minors

File:

• trunk/src/util/loading/resource_manager.h (modified) (2 diffs)

trunk/src/util/loading/resource_manager.h

@@ -74 +74 @@
 
   // more specific
+  union {
+#ifndef NO_MODEL
   float             modelSize;         //!< the size of the model (OBJ/PRIM)
-#ifndef NO_MODEL
   char*             secFileName;       //!< a seconf fileName
 #endif /* NO_MODEL */
@@ -84 +85 @@
   GLenum            texTarget;
 #endif /* NO_TEXTURES */
+  };
 };