Changeset 9667 for code/trunk/src/modules/designtools/SkyboxGenerator.h
- Timestamp:
- Aug 25, 2013, 9:08:42 PM (11 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/core6 merged: 9552-9554,9556-9574,9577-9579,9585-9593,9596-9612,9626-9662
- Property svn:mergeinfo changed
-
code/trunk/src/modules/designtools/SkyboxGenerator.h
r8232 r9667 36 36 #define __SkyboxGenerator_h__ 37 37 38 #include "core/ OrxonoxClass.h"38 #include "core/config/Configurable.h" 39 39 #include "util/Singleton.h" 40 40 #include "tools/interfaces/Tickable.h" … … 58 58 @ingroup Designtools 59 59 */ 60 class SkyboxGenerator : public virtual OrxonoxClass, public Singleton<SkyboxGenerator>, public Tickable60 class SkyboxGenerator : public virtual Configurable, public Singleton<SkyboxGenerator>, public Tickable 61 61 { 62 62 friend class Singleton<SkyboxGenerator>;
Note: See TracChangeset
for help on using the changeset viewer.