Merge pull request #87775 from clayjohn/GLTF-export-ra-rg

akien-mga · akien-mga · commit cb0d450b7deb · 2024-01-31T10:57:17.000+01:00
Remove workaround in GLTF exporter that double converts ra textures to rg
diff --git a/modules/gltf/gltf_document.cpp b/modules/gltf/gltf_document.cpp
@@ -3816,7 +3816,6 @@ Error GLTFDocument::_serialize_materials(Ref<GLTFState> p_state) {
 						}
 						img->decompress();
 						img->convert(Image::FORMAT_RGBA8);
-						img->convert_ra_rgba8_to_rg();
 						for (int32_t y = 0; y < img->get_height(); y++) {
 							for (int32_t x = 0; x < img->get_width(); x++) {
 								Color c = img->get_pixel(x, y);

Original file line number	Diff line number	Diff line change
`@@ -3816,7 +3816,6 @@ Error GLTFDocument::_serialize_materials(Ref<GLTFState> p_state) {`
`3816`	`3816`	`}`
`3817`	`3817`	`img->decompress();`
`3818`	`3818`	`img->convert(Image::FORMAT_RGBA8);`
`3819`		`- img->convert_ra_rgba8_to_rg();`
`3820`	`3819`	`for (int32_t y = 0; y < img->get_height(); y++) {`
`3821`	`3820`	`for (int32_t x = 0; x < img->get_width(); x++) {`
`3822`	`3821`	`Color c = img->get_pixel(x, y);`