diff options
| author | Jacques Lucke <jacques@blender.org> | 2022-03-01 13:36:46 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2022-03-01 13:36:46 +0300 |
| commit | 4b9c77a19aa359b5ab4b86e05cff1c8627d05a1e (patch) | |
| tree | 8a5b74ef6f782e269883a1a38896cea51d4e953c /source/blender/draw/engines/image/image_usage.hh | |
| parent | f0bfceb96d86062245c673938a8272276c1fcacf (diff) | |
| parent | 9216cf9cb589f4d8ec0e79f0f0a160ce2c1dfb07 (diff) | |
Merge branch 'blender-v3.1-release'
Diffstat (limited to 'source/blender/draw/engines/image/image_usage.hh')
| -rw-r--r-- | source/blender/draw/engines/image/image_usage.hh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/draw/engines/image/image_usage.hh b/source/blender/draw/engines/image/image_usage.hh index 2f3f0d23b6a..0643cc87304 100644 --- a/source/blender/draw/engines/image/image_usage.hh +++ b/source/blender/draw/engines/image/image_usage.hh @@ -23,6 +23,8 @@ struct ImageUsage { /** IMA_ALPHA_* */ char alpha_mode; + const void *last_image = nullptr; + ImageUsage() = default; ImageUsage(const struct Image *image, const struct ImageUser *image_user) { @@ -31,6 +33,7 @@ struct ImageUsage { view = image_user ? image_user->multi_index : 0; colorspace_settings = image->colorspace_settings; alpha_mode = image->alpha_mode; + last_image = static_cast<const void *>(image); } bool operator==(const ImageUsage &other) const |