diff options
author | Jacques Lucke <jacques@blender.org> | 2021-11-02 13:15:05 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2021-11-02 13:17:12 +0300 |
commit | 0c3b215e7d5456878b155d13440864f49ad1f230 (patch) | |
tree | 1a405cfe6fbf632442d6ce03821e1828d581bcf4 /source/blender/editors/sculpt_paint | |
parent | 2b3becf2be27286d68a49328a13c327d2fa94aeb (diff) |
Images: refactor how failed image load attempts are remembered
Previously, `ImageTile->ok` and `ImageUser->ok` were used to indicate
whether an image failed to load. There were three possible values
which (probably) had the following meanings:
* `0`: There was an error while loading the image. Don't try to load again.
* `1`: Default value. Try to load the image.
* `2`: The image was loaded successfully.
This image-wide flag did not make sense unfortunately, because loading
may work for some frames of an image sequence but not for others.
Remember than an image data block can also contain a movie.
The purpose of the `->ok` flag was to serve as an optimization to avoid
trying to load a file over and over again when there is an error (e.g. the
file does not exist or is invalid). To get the optimization back, the patch
is changing `MovieCache` so that it can also cache failed load attempts.
As a consequence, `ibuf` is allowed to be `NULL` in a few more places.
I added the appropriate null checks.
This also solves issues when image sequences are used with the
Image Texture node in Geometry nodes (also see D12827).
Differential Revision: https://developer.blender.org/D12957
Diffstat (limited to 'source/blender/editors/sculpt_paint')
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_image_2d.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_image_2d.c b/source/blender/editors/sculpt_paint/paint_image_2d.c index a35e248a78c..63f61b6c5c1 100644 --- a/source/blender/editors/sculpt_paint/paint_image_2d.c +++ b/source/blender/editors/sculpt_paint/paint_image_2d.c @@ -916,8 +916,6 @@ static bool paint_2d_ensure_tile_canvas(ImagePaintState *s, int i) s->tiles[i].cache.lastdiameter = -1; - s->tiles[i].iuser.ok = true; - ImBuf *ibuf = BKE_image_acquire_ibuf(s->image, &s->tiles[i].iuser, NULL); if (ibuf != NULL) { if (ibuf->channels != 4) { @@ -1683,7 +1681,6 @@ void *paint_2d_new_stroke(bContext *C, wmOperator *op, int mode) for (int i = 0; i < s->num_tiles; i++) { s->tiles[i].iuser = sima->iuser; } - s->tiles[0].iuser.ok = true; zero_v2(s->tiles[0].uv_origin); |