Changeset 3280 for code/trunk/src/orxonox/objects/weaponsystem/projectiles/LightningGunProjectile.cc
- Timestamp:
- Jul 12, 2009, 11:58:01 PM (15 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/core4 (added) merged: 3235-3237,3245-3250,3253-3254,3260-3261,3265,3270
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/objects/weaponsystem/projectiles/LightningGunProjectile.cc
r3196 r3280 56 56 this->materialBase_ = material; 57 57 58 BillboardProjectile::setMaterial(material + convertToString(this->textureIndex_));58 BillboardProjectile::setMaterial(material + multi_cast<std::string>(this->textureIndex_)); 59 59 } 60 60
Note: See TracChangeset
for help on using the changeset viewer.