diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-05-21 12:07:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-21 12:07:38 +0200 |
| commit | 2bee15eee1c7e29572b6307d436631963dd310c8 (patch) | |
| tree | 9469cd779dc4f3e5cdd91cd57d28c21ba316fd28 | |
| parent | 9065cc2402b745f87af38224531de11843dcd225 (diff) | |
| parent | 13680885b620eccdde0bc88fc2333d273d74858d (diff) | |
Merge pull request #29050 from hbina/redundant_null_checks
removed a redundant null check in assimp editor
| -rw-r--r-- | modules/assimp/editor_scene_importer_assimp.cpp | 4 |
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); } |