diff --git a/layers/texture_layer_merger.cpp b/layers/texture_layer_merger.cpp index 9bfd0e1..356fab1 100644 --- a/layers/texture_layer_merger.cpp +++ b/layers/texture_layer_merger.cpp @@ -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 &data) { diff --git a/register_types.h b/register_types.h index 8631cf0..edd002d 100644 --- a/register_types.h +++ b/register_types.h @@ -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(); diff --git a/texture_merger.cpp b/texture_merger.cpp index c87ffc7..e4557ba 100644 --- a/texture_merger.cpp +++ b/texture_merger.cpp @@ -87,11 +87,11 @@ void TextureMerger::set_packer(const Ref packer) { Vector TextureMerger::get_textures() { Vector 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; }