Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions modules/editor/texturetools/converter/textureconverter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -272,17 +272,15 @@ AssetConverter::ReturnCode TextureConverter::convertFile(AssetConverterSettings
void TextureConverter::convertTexture(Texture *texture, TextureImportSettings *settings) {
int32_t width = 1;
int32_t height = 1;
int32_t channels = 4;
int32_t channels;

uint8_t *sourceData = stbi_load(settings->source().data(), &width, &height, &channels, 0);
uint8_t *sourceData = stbi_load(settings->source().data(), &width, &height, &channels, 4);

if(sourceData) {
texture->clear();

int format = Texture::RGBA8;
if(channels == 3) {
format = Texture::RGB8;
}
channels = 4;

texture->setFormat(format);
texture->setFiltering(Texture::FilteringType(settings->filtering()));
Expand Down Expand Up @@ -472,6 +470,10 @@ void TextureConverter::convertSprite(Sprite *sprite, TextureImportSettings *sett

Url dst(settings->absoluteDestination());

if(info.uuid.isEmpty()) {
info.uuid = texture->name();
}

AssetConverter::ReturnCode result = settings->saveBinary(Engine::toVariant(texture), dst.absoluteDir() + "/" + info.uuid);
if(result == AssetConverter::Success) {
info.id = texture->uuid();
Expand Down
Loading