maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #29050 from hbina/redundant_null_checks

Browse source 
removed a redundant null check in assimp editor
This commit is contained in:
Rémi Verschelde 2019-05-21 12:07:38 +02:00 committed by GitHub
parent 9065cc2402 13680885b6
commit 2bee15eee1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/assimp/editor_scene_importer_assimp.cpp
View file

@ -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);
}