From 0bf97ad2c8c4c1e006561f35989a3a92ed93e60c Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Tue, 17 Aug 2021 15:27:23 -0500 Subject: [PATCH] decal safeties via if (mMaterialAsset.notNull() && mMaterialAsset->getStatus() == MaterialAsset::Ok) --- Engine/source/T3D/decal/decalData.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Engine/source/T3D/decal/decalData.cpp b/Engine/source/T3D/decal/decalData.cpp index 6951d76e3..7c033b7f6 100644 --- a/Engine/source/T3D/decal/decalData.cpp +++ b/Engine/source/T3D/decal/decalData.cpp @@ -202,7 +202,7 @@ void DecalData::initPersistFields() "grid; use #textureCoords to manually specify UV coordinates for " "irregular sized frames." ); - addField( "textureCoords", TypeRectF, Offset( texRect, DecalData ), MAX_TEXCOORD_COUNT, + addField( "textureCoords", TypeRectUV, Offset( texRect, DecalData ), MAX_TEXCOORD_COUNT, "@brief An array of RectFs (topleft.x topleft.y extent.x extent.y) " "representing the UV coordinates for each frame in the imagemap.\n\n" "@note This field should only be set if the imagemap frames are " @@ -313,7 +313,9 @@ void DecalData::_initMaterial() { SAFE_DELETE( matInst ); - if (mMaterialAsset.notNull()) + _setMaterial(getMaterial()); + + if (mMaterialAsset.notNull() && mMaterialAsset->getStatus() == MaterialAsset::Ok) { matInst = getMaterialResource()->createMatInstance(); }