[Bf-blender-cvs] [fdd282021a9] master: Cleanup: Fix compile warnings

[Jesse Yurkovich]

Commit: fdd282021a98ac89f40cff7d33f646fb96a96133
Author: Jesse Yurkovich
Date:   Thu Aug 4 00:45:25 2022 -0700
Branches: master
https://developer.blender.org/rBfdd282021a98ac89f40cff7d33f646fb96a96133

Cleanup: Fix compile warnings

===================================================================

M	source/blender/editors/space_image/image_buttons.c
M	source/blender/editors/space_image/image_undo.cc

===================================================================

diff --git a/source/blender/editors/space_image/image_buttons.c b/source/blender/editors/space_image/image_buttons.c
index 48f43e05315..2109d3f9701 100644
--- a/source/blender/editors/space_image/image_buttons.c
+++ b/source/blender/editors/space_image/image_buttons.c
@@ -869,7 +869,8 @@ void uiTemplateImage(uiLayout *layout,
     uiItemS(col);
 
     uiItemR(col, &imaptr, "generated_type", UI_ITEM_R_EXPAND, IFACE_("Type"), ICON_NONE);
-    if (ima->gen_type == IMA_GENTYPE_BLANK) {
+    ImageTile *base_tile = BKE_image_get_tile(ima, 0);
+    if (base_tile->gen_type == IMA_GENTYPE_BLANK) {
       uiItemR(col, &imaptr, "generated_color", 0, NULL, ICON_NONE);
     }
   }
diff --git a/source/blender/editors/space_image/image_undo.cc b/source/blender/editors/space_image/image_undo.cc
index 9e8db58ccc2..065641c4051 100644
--- a/source/blender/editors/space_image/image_undo.cc
+++ b/source/blender/editors/space_image/image_undo.cc
@@ -454,7 +454,6 @@ struct UndoImageBuf {
   struct {
     short source;
     bool use_float;
-    char gen_type;
   } image_state;
 };
 
@@ -473,7 +472,6 @@ static UndoImageBuf *ubuf_from_image_no_tiles(Image *image, const ImBuf *ibuf)
       MEM_callocN(sizeof(*ubuf->tiles) * ubuf->tiles_len, __func__));
 
   BLI_strncpy(ubuf->ibuf_name, ibuf->name, sizeof(ubuf->ibuf_name));
-  ubuf->image_state.gen_type = image->gen_type;
   ubuf->image_state.source = image->source;
   ubuf->image_state.use_float = ibuf->rect_float != nullptr;