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:
authorSergey Sharybin <sergey@blender.org>2022-02-10 12:48:06 +0300
committerSergey Sharybin <sergey@blender.org>2022-02-10 12:48:06 +0300
commit8c18b16829bf22c7783c8e94002471211bbbbf24 (patch)
tree4af6ec8dec3284de5961d2e7cc8b57b51d5fb511 /source/blender/draw
parente6ad11f06dd7875c66b1c0a2bfabd2cd3eb1d8c7 (diff)
parent5312cf50a1f71f9baa63d516f1e5eef728339efb (diff)
Merge branch 'blender-v3.1-release'
Diffstat (limited to 'source/blender/draw')
-rw-r--r--source/blender/draw/engines/image/image_partial_updater.hh12
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/draw/engines/image/image_partial_updater.hh b/source/blender/draw/engines/image/image_partial_updater.hh
index f0c1db2331a..e74c31e9e8a 100644
--- a/source/blender/draw/engines/image/image_partial_updater.hh
+++ b/source/blender/draw/engines/image/image_partial_updater.hh
@@ -32,11 +32,11 @@ struct PartialImageUpdater {
/**
* \brief Ensure that there is a partial update user for the given image.
*/
- void ensure_image(const Image *image)
+ void ensure_image(const Image *new_image)
{
- if (!is_valid(image)) {
+ if (!is_valid(new_image)) {
free();
- create(image);
+ create(new_image);
}
}
@@ -60,11 +60,11 @@ struct PartialImageUpdater {
return user != nullptr;
}
- void create(const Image *image)
+ void create(const Image *new_image)
{
BLI_assert(user == nullptr);
- user = BKE_image_partial_update_create(image);
- image = image;
+ user = BKE_image_partial_update_create(new_image);
+ image = new_image;
}
void free()