From 9ead2b6b12f7cf4584b7a4763ea96c95309f22c2 Mon Sep 17 00:00:00 2001 From: Brandon Mak Date: Mon, 20 Mar 2023 15:03:18 +0800 Subject: [PATCH] Added if statement for particle texture check --- Assets/Scenes/Scene2.shade | 2 +- SHADE_Engine/src/Serialization/SHYAMLConverters.h | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Assets/Scenes/Scene2.shade b/Assets/Scenes/Scene2.shade index 11078394..b4d7abbd 100644 --- a/Assets/Scenes/Scene2.shade +++ b/Assets/Scenes/Scene2.shade @@ -170,7 +170,7 @@ Angular Ranges And Offset: {x: 6.19999981, y: 1.10000002, z: 0, w: 0.100000001} Rotation Speed: 0.0309999995 Rotation Decay: 0.0199999996 - Texture Asset ID: 0 + Texture Asset ID: 63456868 Custom Update Shader Asset ID: 0 IsActive: true Scripts: ~ \ No newline at end of file diff --git a/SHADE_Engine/src/Serialization/SHYAMLConverters.h b/SHADE_Engine/src/Serialization/SHYAMLConverters.h index 44ed0888..2550388e 100644 --- a/SHADE_Engine/src/Serialization/SHYAMLConverters.h +++ b/SHADE_Engine/src/Serialization/SHYAMLConverters.h @@ -590,8 +590,15 @@ namespace YAML SHResourceManager::FinaliseChanges(); //gfxSystem->BuildTextures(); - rhs.SetTextureIndex(texture->TextureArrayIndex); - rhs.SetTextureAssetID(id); + if (texture) + { + rhs.SetTextureIndex(texture->TextureArrayIndex); + rhs.SetTextureAssetID(id); + } + else + { + SHLOG_WARNING ("Texture not set for particle emitter component: texture handle is null. "); + } } if (node[CUSTOM_UPDATE_SHADER_ASSET_ID_TAG.data()].IsDefined())