godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #56023 from Zylann/null_checks

Browse Source
This commit is contained in:
Rémi Verschelde 2021-12-17 19:11:59 +01:00 committed by GitHub
commit 52217244f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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();