Relintai/texture_packer
1
0
Fork 0
mirror of https://github.com/Relintai/texture_packer.git synced 2025-02-06 16:26:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clang format.

Browse Source
This commit is contained in:
Relintai 2020-04-10 14:00:09 +02:00
parent b78d280a6e
commit c62297108f
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
layers/texture_layer_merger.cpp
View File

@ -311,11 +311,11 @@ void TextureLayerMerger::merge() {
}
}
#if VERSION_MAJOR < 4
#if VERSION_MAJOR < 4
_image->create(_width, _height, (_texture_flags & Texture::FLAG_MIPMAPS) != 0, Image::FORMAT_RGBA8, data);
#else
#else
_image->create(_width, _height, true, Image::FORMAT_RGBA8, data);
#endif
#endif
}
void TextureLayerMerger::write_base_color_to_array(PoolVector<uint8_t> &data) {

1
register_types.h
View File

@ -20,6 +20,5 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
*/
void register_texture_packer_types();
void unregister_texture_packer_types();

6
texture_merger.cpp
View File

@ -87,11 +87,11 @@ void TextureMerger::set_packer(const Ref<TexturePacker> packer) {
Vector<Variant> TextureMerger::get_textures() {
Vector<Variant> r;
for (int i = 0; i < _textures.size(); i++) {
#if VERSION_MAJOR < 4
#if VERSION_MAJOR < 4
r.push_back(_textures[i].get_ref_ptr());
#else
#else
r.push_back(_textures[i]);
#endif
#endif
}
return r;
}