Changeset 5693 for code/trunk/src/orxonox/tools/Shader.h
- Timestamp:
- Aug 29, 2009, 10:19:38 PM (15 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/libraries (added) merged: 5612-5613,5615-5619,5621-5623,5625-5640,5642-5643,5647-5649,5665-5666,5685-5687,5692
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/tools/Shader.h
r3196 r5693 30 30 #define _Shader_H__ 31 31 32 #include " OrxonoxPrereqs.h"32 #include "tools/ToolsPrereqs.h" 33 33 34 34 #include <map> … … 37 37 38 38 #include "util/OgreForwardRefs.h" 39 #include " interfaces/Tickable.h"39 #include "tools/interfaces/Tickable.h" 40 40 41 41 namespace orxonox 42 42 { 43 class _ OrxonoxExport Shader : public Tickable43 class _ToolsExport Shader : public Tickable 44 44 { 45 45 typedef std::pair<bool, void*> ParameterPointer;
Note: See TracChangeset
for help on using the changeset viewer.