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 pull request #884 from GarageGames/development-3.6

Browse source 
Version 3.6.2
This commit is contained in:
Daniel Buckmaster 2014-11-05 20:28:01 +11:00
commit 3082bb3adc
28 changed files with 132 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -368,7 +368,7 @@ void ProcessedFFMaterial::_initPassStateBlock( RenderPassData *rpd, GFXStateBloc
result.blendDefined = true;
result.blendEnable = true;
result.blendSrc = GFXBlendOne;
result.blendSrc = GFXBlendOne;
result.blendDest = GFXBlendZero;
}
// This is here for generic FF shader fallbacks.

1
Engine/source/materials/processedShaderMaterial.cpp
View file

@ -328,6 +328,7 @@ void ProcessedShaderMaterial::_determineFeatures( U32 stageNum,
if ( features.hasFeature( MFT_UseInstancing ) &&
mMaxStages == 1 &&
!mMaterial->mGlow[0] &&
!mMaterial->mDynamicCubemap &&
shaderVersion >= 3.0f )
fd.features.addFeature( MFT_UseInstancing );