TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-05 21:40:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'Preview4_0' into SoundAssetImplements

Browse source 
# Conflicts:
#	Engine/source/T3D/assets/assetImporter.cpp
#	Engine/source/forest/forestItem.cpp
This commit is contained in:
AzaezelX 2021-10-11 20:11:27 -05:00
commit f5600826d7
122 changed files with 686 additions and 577 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/gfx/sim/cubemapData.cpp
View file

@ -135,7 +135,7 @@ void CubemapData::createMap()
if( initSuccess )
{
mCubemap = GFX->createCubemap();
if (mCubeMapFace == NULL || mCubeMapFace->isNull())
if (!mCubeMapFace || mCubeMapFace->isNull())
return;
mCubemap->initStatic(mCubeMapFace);
}