AzaezelX 97ec99f704 Merge branch 'development' of https://github.com/GarageGames/Torque3D into PBR_ProbeArrayGLWIP ... # Conflicts: # Engine/source/gfx/D3D11/gfxD3D11Device.cpp # Engine/source/lighting/lightManager.cpp # Templates/Full/game/levels/Empty Room.mis # Templates/Full/game/levels/Empty Terrain.mis		2019-05-01 23:18:31 -05:00
..
materialEditor.ed.cs	Merge branch 'development' of https://github.com/GarageGames/Torque3D into PBR_ProbeArrayGLWIP	2019-05-01 23:18:31 -05:00
materialEditorUndo.ed.cs	Failed to get the Scene changes for the Full template rolled up. This corrects that.	2019-03-31 22:12:38 -05:00