Merge branch 'master' of github.com:fataku/LOG750-LAB2

This commit is contained in:
Dmitri K 2016-11-18 17:51:53 -05:00
commit 74e43e0294

View File

@ -187,7 +187,7 @@ void Viewer::mousePressEvent(QMouseEvent* e) {
std::cout << "Window geom: " << this->window()->size().width() << "w, " << this->window()->size().height() << "h" << endl;
QMatrix4x4 selectedPosition = pickGeom(x, y);
if(!selectedPosition.isIdentity())
if(!selectedPosition.isIdentity() && e->modifiers().testFlag(Qt::ShiftModifier))
{
Cube* c = new Cube;
c->setType(TEX_WOODFLOOR);