Merge branch 'blender-v2.82-release'

1 files changed, 7 insertions, 4 deletions

diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c
index 794f260c058..deae1afc18d 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -2510,7 +2510,7 @@ static bool image_should_be_saved_when_modified(Image *ima)
 static bool image_should_be_saved(Image *ima, bool *is_format_writable)
 {
   if (BKE_image_is_dirty_writable(ima, is_format_writable) &&
-      (ima->source == IMA_SRC_FILE || ima->source == IMA_SRC_GENERATED)) {
+      ELEM(ima->source, IMA_SRC_FILE, IMA_SRC_GENERATED, IMA_SRC_TILED)) {
     return image_should_be_saved_when_modified(ima);
   }
   else {
@@ -3148,7 +3148,8 @@ static bool image_pack_test(bContext *C, wmOperator *op)
   }
 
   if (ELEM(ima->source, IMA_SRC_SEQUENCE, IMA_SRC_MOVIE, IMA_SRC_TILED)) {
-    BKE_report(op->reports, RPT_ERROR, "Packing movies or image sequences not supported");
+    BKE_report(
+        op->reports, RPT_ERROR, "Packing movies, image sequences or tiled images not supported");
     return 0;
   }
 
@@ -3216,7 +3217,8 @@ static int image_unpack_exec(bContext *C, wmOperator *op)
   }
 
   if (ELEM(ima->source, IMA_SRC_SEQUENCE, IMA_SRC_MOVIE, IMA_SRC_TILED)) {
-    BKE_report(op->reports, RPT_ERROR, "Unpacking movies or image sequences not supported");
+    BKE_report(
+        op->reports, RPT_ERROR, "Unpacking movies, image sequences or tiled images not supported");
     return OPERATOR_CANCELLED;
   }
 
@@ -3249,7 +3251,8 @@ static int image_unpack_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSE
   }
 
   if (ELEM(ima->source, IMA_SRC_SEQUENCE, IMA_SRC_MOVIE, IMA_SRC_TILED)) {
-    BKE_report(op->reports, RPT_ERROR, "Unpacking movies or image sequences not supported");
+    BKE_report(
+        op->reports, RPT_ERROR, "Unpacking movies, image sequences or tiled images not supported");
     return OPERATOR_CANCELLED;
   }