archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: do not use magic values for enums...

Browse Source
This commit is contained in:
Bastien Montagne
2020-07-03 12:44:13 +02:00
parent 8e0f8bb3e1
commit ae5529c848
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/intern/image.c
View File

@@ -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"); ImageTile *tile = MEM_callocN(sizeof(ImageTile), "image new tile");
tile->ok = 1; tile->ok = IMA_OK;
tile->tile_number = tile_number; tile->tile_number = tile_number;
if (next_tile) { if (next_tile) {
@@ -3674,7 +3674,7 @@ bool BKE_image_fill_tile(struct Image *ima,
if (tile_ibuf != NULL) { if (tile_ibuf != NULL) {
image_assign_ibuf(ima, tile_ibuf, 0, tile->tile_number); image_assign_ibuf(ima, tile_ibuf, 0, tile->tile_number);
BKE_image_release_ibuf(ima, tile_ibuf, NULL); BKE_image_release_ibuf(ima, tile_ibuf, NULL);
tile->ok = 1; tile->ok = IMA_OK;
return true; return true;
} }
return false; return false;

3
source/blender/blenloader/intern/readfile.c
View File

@@ -128,6 +128,7 @@
#include "BKE_hair.h" #include "BKE_hair.h"
#include "BKE_idprop.h" #include "BKE_idprop.h"
#include "BKE_idtype.h" #include "BKE_idtype.h"
#include "BKE_image.h"
#include "BKE_layer.h" #include "BKE_layer.h"
#include "BKE_lib_id.h" #include "BKE_lib_id.h"
#include "BKE_lib_override.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); ima->preview = direct_link_preview_image(reader, ima->preview);
BLO_read_data_address(reader, &ima->stereo3d_format); BLO_read_data_address(reader, &ima->stereo3d_format);
LISTBASE_FOREACH (ImageTile *, tile, &ima->tiles) { LISTBASE_FOREACH (ImageTile *, tile, &ima->tiles) {
tile->ok = 1; tile->ok = IMA_OK;
} }
} }