Просмотр исходного кода

Merge pull request #29050 from hbina/redundant_null_checks

removed a redundant null check in assimp editor
Rémi Verschelde 6 лет назад
Родитель
Сommit
2bee15eee1
1 измененных файлов с 1 добавлено и 3 удалено
  1. 1 3
      modules/assimp/editor_scene_importer_assimp.cpp

+ 1 - 3
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);
 				}