Commit: d08ccd526f3641d79467e5d8d85a32a29acd2ade Author: Lukas Stockner Date: Mon Feb 10 16:19:30 2020 +0100 Branches: blender-v2.82-release https://developer.blender.org/rBd08ccd526f3641d79467e5d8d85a32a29acd2ade
Fix unreported: Packing/unpacking errors don't mention tiled images Thanks to @dfelinto for spotting this! =================================================================== M source/blender/editors/space_image/image_ops.c =================================================================== diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index 18e084729bd..99929a4a0b7 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -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; } _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs