Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels

This commit is contained in:
Atlante45 2014-03-10 16:41:56 -07:00
commit dd4604f1c5

View file

@ -21,6 +21,7 @@ using namespace std;
Model::Model(QObject* parent) :
QObject(parent),
_scale(1.0f, 1.0f, 1.0f),
_shapesAreDirty(true),
_lodDistance(0.0f),
_pupilDilation(0.0f) {