fix bad merge

This commit is contained in:
Andrew Meadows 2016-01-04 14:49:20 -08:00
parent 4f29156da1
commit c1206ca73d

View file

@ -109,9 +109,6 @@ Avatar::Avatar(RigPointer rig) :
Avatar::~Avatar() {
assert(isDead()); // mark dead before calling the dtor
for(auto attachment : _unusedAttachments) {
delete attachment;
}
if (_motionState) {
delete _motionState;
_motionState = nullptr;