diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/image.cpp | 9 | ||||
| -rw-r--r-- | core/image.h | 1 | ||||
| -rw-r--r-- | core/undo_redo.cpp | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/core/image.cpp b/core/image.cpp index 172f5e517a..698a0b0b98 100644 --- a/core/image.cpp +++ b/core/image.cpp @@ -1766,6 +1766,15 @@ int Image::get_image_required_mipmaps(int p_width, int p_height, Format p_format return mm; } +int Image::get_image_mipmap_offset(int p_width, int p_height, Format p_format, int p_mipmap) { + + if (p_mipmap <= 0) { + return 0; + } + int mm; + return _get_dst_image_size(p_width, p_height, p_format, mm, p_mipmap - 1); +} + bool Image::is_compressed() const { return format > FORMAT_RGBE9995; } diff --git a/core/image.h b/core/image.h index 11f9380c3c..0770eb953e 100644 --- a/core/image.h +++ b/core/image.h @@ -286,6 +286,7 @@ public: static int get_image_data_size(int p_width, int p_height, Format p_format, bool p_mipmaps = false); static int get_image_required_mipmaps(int p_width, int p_height, Format p_format); + static int get_image_mipmap_offset(int p_width, int p_height, Format p_format, int p_mipmap); enum CompressMode { COMPRESS_S3TC, diff --git a/core/undo_redo.cpp b/core/undo_redo.cpp index 7d67076df5..6f7c8ea08a 100644 --- a/core/undo_redo.cpp +++ b/core/undo_redo.cpp @@ -333,7 +333,7 @@ void UndoRedo::clear_history() { while (actions.size()) _pop_history_tail(); - //version++; + version++; } String UndoRedo::get_current_action_name() const { |