Relintai
/
texture_packer
mirror of https://github.com/Relintai/texture_packer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix android build.

This commit is contained in:
Relintai 2019-10-31 02:15:58 +01:00
parent 0dd28a6525
commit 2b901b0731
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
layers/texture_layer_merger.cpp
View File

@ -161,7 +161,7 @@ void TextureLayerMerger::merge() {
write_base_color_to_array(data); write_base_color_to_array(data);
for (int i = 0; i < _entries.size(); ++i) { for (int i = 0; i < _entries.size(); ++i) {
LayerMergerEntry &e = _entries.get(i); const LayerMergerEntry &e = _entries[i];
ERR_CONTINUE(!e.texture.is_valid()); ERR_CONTINUE(!e.texture.is_valid());
@ -212,7 +212,7 @@ void TextureLayerMerger::merge() {
int iih = input_image->get_height(); int iih = input_image->get_height();
PoolVector<uint8_t> input_image_data = input_image->get_data(); PoolVector<uint8_t> input_image_data = input_image->get_data();
Color &blendcolor = e.color; const Color &blendcolor = e.color;
float blend_arr[] = { float blend_arr[] = {
blendcolor.r, blendcolor.r,