AzaezelX afa52850c3 Merge branch 'CustomShaderFeaturesPR' of https://github.com/Areloch/Torque3D into alpha40Macwork ... # Conflicts: # Engine/source/materials/materialDefinition.cpp # Engine/source/materials/processedFFMaterial.h # Engine/source/materials/processedShaderMaterial.cpp # Engine/source/renderInstance/renderBinManager.cpp # Engine/source/renderInstance/renderGlowMgr.cpp # Engine/source/renderInstance/renderMeshMgr.cpp # Engine/source/renderInstance/renderPassManager.h # Engine/source/renderInstance/renderTranslucentMgr.cpp # Engine/source/shaderGen/customShaderFeature.cpp # Engine/source/shaderGen/customShaderFeature.h		2019-05-22 23:36:15 -05:00
..
bin	git being a butt with language files. again.	2019-03-18 03:41:44 -05:00
lib	glTF2 Importer Update.	2019-04-25 15:41:01 -04:00
modules/Verve	(Mostly) updated verve implementation.	2019-03-07 16:23:41 -06:00
source	Merge branch 'CustomShaderFeaturesPR' of https://github.com/Areloch/Torque3D into alpha40Macwork	2019-05-22 23:36:15 -05:00