TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-11 06:34:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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

Browse source 
# Conflicts:
#	Engine/source/sfx/sfxSystem.cpp
This commit is contained in:
Azaezel 2018-04-23 10:08:14 -05:00
commit 13334b4d5c
22 changed files with 72 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/materials/processedMaterial.cpp
View file

@ -103,7 +103,7 @@ ProcessedMaterial::ProcessedMaterial()
ProcessedMaterial::~ProcessedMaterial()
{
for_each( mPasses.begin(), mPasses.end(), delete_pointer() );
T3D::for_each( mPasses.begin(), mPasses.end(), T3D::delete_pointer() );
}
void ProcessedMaterial::_setBlendState(Material::BlendOp blendOp, GFXStateBlockDesc& desc )