History

Merge branch 'ragdoll' of ssh://github.com/AndrewMeadows/hifi into ragdoll

Andrew Meadows committed 12 years ago

Commit c2f46482 parents 543bf52 77047b01 file · +2 −4Browse files

Showing the changes to interface/src/avatar/SkeletonModel.cpp (1 of 1 file). Show all

Unified · Split

interface/src/avatar/SkeletonModel.cpp+2−4
@@ -31,10 +31,8 @@ SkeletonModel::SkeletonModel(Avatar* owningAvatar, QObject* parent) : · 30 unmodified lines
31}31}
32 32
33SkeletonModel::~SkeletonModel() {33SkeletonModel::~SkeletonModel() {
34 if (_ragdoll) {34 delete _ragdoll;
35 delete _ragdoll;35 _ragdoll = NULL;
36 _ragdoll = NULL;
37 }
38}36}
39 37
40void SkeletonModel::setJointStates(QVector<JointState> states) {38void SkeletonModel::setJointStates(QVector<JointState> states) {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t