summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorhbina085 <hanif.ariffin.4326@gmail.com>2019-05-20 15:58:46 -0400
committerhbina085 <hanif.ariffin.4326@gmail.com>2019-05-20 18:08:59 -0400
commit13680885b620eccdde0bc88fc2333d273d74858d (patch)
tree597794f71b18f6f6e4ceb4ae2cc77c31bc480dfa /modules
parentd400a7bdddf9b0b755ecc8bda3d79f4c709093d5 (diff)
removed a redundant NULL check in assimp editor of a pointer to an array declared in the same statement block
Diffstat (limited to 'modules')
-rw-r--r--modules/assimp/editor_scene_importer_assimp.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/modules/assimp/editor_scene_importer_assimp.cpp b/modules/assimp/editor_scene_importer_assimp.cpp
index 4cf8782721..8c3c04674b 100644
--- a/modules/assimp/editor_scene_importer_assimp.cpp
+++ b/modules/assimp/editor_scene_importer_assimp.cpp
@@ -855,9 +855,7 @@ Ref<Material> EditorSceneImporterAssimp::_generate_material_from_index(ImportSta
Ref<Texture> texture = _load_texture(state, path);
if (texture != NULL) {
- if (map_mode != NULL) {
- _set_texture_mapping_mode(map_mode, texture);
- }
+ _set_texture_mapping_mode(map_mode, texture);
mat->set_feature(SpatialMaterial::Feature::FEATURE_NORMAL_MAPPING, true);
mat->set_texture(SpatialMaterial::TEXTURE_NORMAL, texture);
}