mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-14 08:04:40 +00:00
Minor fixes and corrections
This commit is contained in:
parent
de26f519f9
commit
b338510921
2 changed files with 2 additions and 2 deletions
|
|
@ -6184,7 +6184,7 @@ void Player::updateWorkingCollisionSet()
|
||||||
if (mDataBlock->shapeAssetRef.isNull())
|
if (mDataBlock->shapeAssetRef.isNull())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
Resource<TSShape> shape = mDataBlock->shapeFPAssetRef->assetPtr->getShapeResource();
|
Resource<TSShape> shape = mDataBlock->shapeAssetRef.assetPtr->getShapeResource();
|
||||||
if (!shape)
|
if (!shape)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -602,7 +602,7 @@ void VolumetricFog::unpackUpdate(NetConnection *con, BitStream *stream)
|
||||||
VectorF mOldScale = getScale();
|
VectorF mOldScale = getScale();
|
||||||
StringTableEntry oldTextureName = mTextureAsset.getAssetId();
|
StringTableEntry oldTextureName = mTextureAsset.getAssetId();
|
||||||
StringTableEntry oldShapeAsset = mShapeAssetRef.assetId;
|
StringTableEntry oldShapeAsset = mShapeAssetRef.assetId;
|
||||||
StringTableEntry oldShape = mShapeAssetRef.assetPtr->getShapeFile();
|
StringTableEntry oldShape = mShapeAssetRef.notNull() ? mShapeAssetRef.assetPtr->getShapeFile() : StringTable->EmptyString();
|
||||||
|
|
||||||
if (stream->readFlag())// Fog color
|
if (stream->readFlag())// Fog color
|
||||||
stream->read(&mFogColor);
|
stream->read(&mFogColor);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue