Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 330 vs 331 for /trunk/Source Code/Core/Resources/Headers/ResourceDescriptor.h

Diff revisions: vs.
  @@ -92,20 +92,24 @@
92 92
93 93 template<typename T>
94 94 inline void setPropertyDescriptor(const T& descriptor) {
95 - MemoryManager::SAFE_UPDATE(_propertyDescriptor, New T(descriptor));
95 + MemoryManager::SAFE_UPDATE(_propertyDescriptor, MemoryManager_NEW T(descriptor));
96 96 }
97 97
98 98 private:
99 - stringImpl _name; ///< Item name
100 - stringImpl _resourceLocation; ///< Physical file location
101 - stringImpl _properties; ///< Comma separated list of properties
99 + /// Item name
100 + stringImpl _name;
101 + /// Physical file location
102 + stringImpl _resourceLocation;
103 + /// Comma separated list of properties
104 + stringImpl _properties;
102 105 bool _flag;
103 106 bool _threaded;
104 107 U32 _id;
105 - P32 _mask; ///<4 bool values representing ... anything ...
108 + /// 4 bool values representing ... anything ...
109 + P32 _mask;
106 110 U8 _enumValue;
107 -
108 - PropertyDescriptor* _propertyDescriptor; ///< Use for extra resource properties: textures, samplers, terrain etc.
111 + /// Use for extra resource properties: textures, samplers, terrain etc.
112 + PropertyDescriptor* _propertyDescriptor;
109 113 };
110 114
111 115 }; //namespace Divide