From ac97f129d305b8fe53c6e1d732509f451a18a3f2 Mon Sep 17 00:00:00 2001 From: Brad Hefta-Gaub Date: Fri, 10 Jan 2014 20:49:08 -0800 Subject: [PATCH] change interface since its confusing windows compiler --- libraries/particles/src/Particle.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/particles/src/Particle.h b/libraries/particles/src/Particle.h index fd950b7d0a..2c112daeeb 100644 --- a/libraries/particles/src/Particle.h +++ b/libraries/particles/src/Particle.h @@ -99,7 +99,7 @@ public: _color[BLUE_INDEX] = value.blue; } void setRadius(float value) { _radius = value; } - void setMass(float value); + void setMass(float value); void setGravity(const glm::vec3& value) { _gravity = value; } void setInHand(bool inHand) { _inHand = inHand; } void setDamping(float value) { _damping = value; } @@ -129,11 +129,11 @@ public: static VoxelEditPacketSender* getVoxelEditPacketSender() { return _voxelEditSender; } static ParticleEditPacketSender* getParticleEditPacketSender() { return _particleEditSender; } - static void setVoxelEditPacketSender(VoxelEditPacketSender* interface) - { _voxelEditSender = interface; } + static void setVoxelEditPacketSender(VoxelEditPacketSender* senderInterface) + { _voxelEditSender = senderInterface; } - static void setParticleEditPacketSender(ParticleEditPacketSender* interface) - { _particleEditSender = interface; } + static void setParticleEditPacketSender(ParticleEditPacketSender* senderInterface) + { _particleEditSender = senderInterface; } protected: