Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-21 19:04:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #1364 from ey6es/master

Browse source 
Fix for obnoxious C++0x warning in GCC.
This commit is contained in:
Andrzej Kapolka 2013-12-12 16:47:16 -08:00
commit 5cdd36b95a
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/particles/src/Particle.h
View file

@ -57,7 +57,7 @@ public:
const glm::vec3& getPosition() const { return _position; }
const rgbColor& getColor() const { return _color; }
xColor getColor() { return { _color[RED_INDEX], _color[GREEN_INDEX], _color[BLUE_INDEX] }; }
xColor getColor() { xColor color = { _color[RED_INDEX], _color[GREEN_INDEX], _color[BLUE_INDEX] }; return color; }
float getRadius() const { return _radius; }
const glm::vec3& getVelocity() const { return _velocity; }
const glm::vec3& getGravity() const { return _gravity; }
@ -144,4 +144,4 @@ private:
};
#endif /* defined(__hifi__Particle__) */
#endif /* defined(__hifi__Particle__) */