Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/makesdna/DNA_image_types.h')
-rw-r--r--source/blender/makesdna/DNA_image_types.h19
1 files changed, 13 insertions, 6 deletions
diff --git a/source/blender/makesdna/DNA_image_types.h b/source/blender/makesdna/DNA_image_types.h
index 6e4e515a0fe..f35c77f663b 100644
--- a/source/blender/makesdna/DNA_image_types.h
+++ b/source/blender/makesdna/DNA_image_types.h
@@ -92,8 +92,14 @@ typedef struct ImageTile {
struct ImageTile_Runtime runtime;
- char _pad[4];
int tile_number;
+
+ /* for generated images */
+ int gen_x, gen_y;
+ char gen_type, gen_flag;
+ short gen_depth;
+ float gen_color[4];
+
char label[64];
} ImageTile;
@@ -167,10 +173,10 @@ typedef struct Image {
int lastused;
/* for generated images */
- int gen_x, gen_y;
- char gen_type, gen_flag;
- short gen_depth;
- float gen_color[4];
+ int gen_x DNA_DEPRECATED, gen_y DNA_DEPRECATED;
+ char gen_type DNA_DEPRECATED, gen_flag DNA_DEPRECATED;
+ short gen_depth DNA_DEPRECATED;
+ float gen_color[4] DNA_DEPRECATED;
/* display aspect - for UV editing images resized for faster openGL display */
float aspx, aspy;
@@ -262,7 +268,8 @@ enum {
/** #Image.gen_flag */
enum {
- IMA_GEN_FLOAT = 1,
+ IMA_GEN_FLOAT = (1 << 0),
+ IMA_GEN_TILE = (1 << 1),
};
/** #Image.alpha_mode */