asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't crash when texture param is null

Browse source
This commit is contained in:
Marc Gilleron 2021-12-17 15:56:41 +00:00
parent 58712e96ae
commit 5c3b92e94f
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
editor/import/resource_importer_texture.cpp
View file

@ -37,6 +37,8 @@
#include "editor/editor_node.h" #include "editor/editor_node.h"
void ResourceImporterTexture::_texture_reimport_roughness(const Ref<StreamTexture2D> &p_tex, const String &p_normal_path, RS::TextureDetectRoughnessChannel p_channel) { void ResourceImporterTexture::_texture_reimport_roughness(const Ref<StreamTexture2D> &p_tex, const String &p_normal_path, RS::TextureDetectRoughnessChannel p_channel) {
ERR_FAIL_COND(p_tex.is_null());
MutexLock lock(singleton->mutex); MutexLock lock(singleton->mutex);
StringName path = p_tex->get_path(); StringName path = p_tex->get_path();
@ -51,6 +53,8 @@ void ResourceImporterTexture::_texture_reimport_roughness(const Ref<StreamTextur
} }
void ResourceImporterTexture::_texture_reimport_3d(const Ref<StreamTexture2D> &p_tex) { void ResourceImporterTexture::_texture_reimport_3d(const Ref<StreamTexture2D> &p_tex) {
ERR_FAIL_COND(p_tex.is_null());
MutexLock lock(singleton->mutex); MutexLock lock(singleton->mutex);
StringName path = p_tex->get_path(); StringName path = p_tex->get_path();
@ -63,6 +67,8 @@ void ResourceImporterTexture::_texture_reimport_3d(const Ref<StreamTexture2D> &p
} }
void ResourceImporterTexture::_texture_reimport_normal(const Ref<StreamTexture2D> &p_tex) { void ResourceImporterTexture::_texture_reimport_normal(const Ref<StreamTexture2D> &p_tex) {
ERR_FAIL_COND(p_tex.is_null());
MutexLock lock(singleton->mutex); MutexLock lock(singleton->mutex);
StringName path = p_tex->get_path(); StringName path = p_tex->get_path();