Integrating github/staging through commit ab87ed9

This commit is contained in:
alexpete
2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
-4
View File
@@ -40,10 +40,6 @@ void CAlignPickCallback::OnPick(CBaseObject* picked)
const Vec3& pickedScale = picked->GetScale();
const Vec3& pickedPos = picked->GetPos();
float fPickedWidth = pickedAABB.max.x - pickedAABB.min.x;
float fPickedHeight = pickedAABB.max.z - pickedAABB.min.z;
float fPickedLength = pickedAABB.max.y - pickedAABB.min.y;
bool bKeepScale = CheckVirtualKey(Qt::Key_Shift);
bool bKeepRotation = CheckVirtualKey(Qt::Key_Alt);
bool bAlignToBoundBox = CheckVirtualKey(Qt::Key_Control);