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

Merge branch 'Preview4_0' of https://github.com/TorqueGameEngines/Torque3D into kermithelpme

Browse source
This commit is contained in:
AzaezelX 2021-10-09 11:32:13 -05:00
commit e2e1c491ac
68 changed files with 171 additions and 167 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/lighting/advanced/advancedLightBinManager.h
View file

@ -70,7 +70,7 @@ protected:
GFXStateBlockRef mLitState[NUM_LIT_STATES][2];
public:
LightMatInstance(Material &mat) : Parent(mat), mLightMapParamsSC(NULL), mInternalPass(false), mSpecialLight(NULL) {}
LightMatInstance(Material &mat) : Parent(mat), mLightMapParamsSC(NULL), mInternalPass(false), mSpecialLight(false) {}
virtual bool init( const FeatureSet &features, const GFXVertexFormat *vertexFormat );
virtual bool setupPass( SceneRenderState *state, const SceneData &sgData );

4
Engine/source/lighting/basic/blTerrainSystem.cpp
View file

@ -682,9 +682,9 @@ bool blTerrainSystem::createPersistChunkFromProxy(SceneLighting::ObjectProxy* ob
{
*ret = new blTerrainChunk();
return true;
} else {
return NULL;
}
return false;
}
// Given a ray, this will return the color from the lightmap of this object, return true if handled