TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-27 16:19:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'development' of https://github.com/GarageGames/Torque3D into andOrMaybe

Browse source 
Conflicts:
	Engine/source/T3D/staticShape.cpp
This commit is contained in:
Azaezel 2016-12-20 22:50:28 -06:00
commit dd071484da
517 changed files with 87707 additions and 178465 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Engine/source/gui/containers/guiRolloutCtrl.cpp
View file

@ -176,7 +176,6 @@ void GuiRolloutCtrl::removeObject( SimObject *obj )
void GuiRolloutCtrl::onMouseDown( const GuiEvent &event )
{
Point2I localPoint = globalToLocalCoord( event.mousePoint );
mouseLock();
}