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:
authorBastien Montagne <bastien@blender.org>2020-07-03 13:44:13 +0300
committerBastien Montagne <bastien@blender.org>2020-07-03 13:56:21 +0300
commitae5529c848127b0c87809e17516a1fe283e49a69 (patch)
treed4c86a174b382f4cab20fc1a974cf4d621307a7b /source/blender
parent8e0f8bb3e153d5cae0050ceb90e6b561069fe05b (diff)
Cleanup: do not use magic values for enums...
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/blenkernel/intern/image.c4
-rw-r--r--source/blender/blenloader/intern/readfile.c3
2 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index e1d055512f0..41ef5dc00ef 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -3606,7 +3606,7 @@ ImageTile *BKE_image_add_tile(struct Image *ima, int tile_number, const char *la
}
ImageTile *tile = MEM_callocN(sizeof(ImageTile), "image new tile");
- tile->ok = 1;
+ tile->ok = IMA_OK;
tile->tile_number = tile_number;
if (next_tile) {
@@ -3674,7 +3674,7 @@ bool BKE_image_fill_tile(struct Image *ima,
if (tile_ibuf != NULL) {
image_assign_ibuf(ima, tile_ibuf, 0, tile->tile_number);
BKE_image_release_ibuf(ima, tile_ibuf, NULL);
- tile->ok = 1;
+ tile->ok = IMA_OK;
return true;
}
return false;
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 28bab96cc6d..a24ccdc2dc1 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -128,6 +128,7 @@
#include "BKE_hair.h"
#include "BKE_idprop.h"
#include "BKE_idtype.h"
+#include "BKE_image.h"
#include "BKE_layer.h"
#include "BKE_lib_id.h"
#include "BKE_lib_override.h"
@@ -4396,7 +4397,7 @@ static void direct_link_image(BlendDataReader *reader, Image *ima)
ima->preview = direct_link_preview_image(reader, ima->preview);
BLO_read_data_address(reader, &ima->stereo3d_format);
LISTBASE_FOREACH (ImageTile *, tile, &ima->tiles) {
- tile->ok = 1;
+ tile->ok = IMA_OK;
}
}