diff options
| -rw-r--r-- | source/blender/compositor/operations/COM_TextureOperation.cc | 2 | ||||
| -rw-r--r-- | source/blender/draw/engines/image/image_partial_updater.hh | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/compositor/operations/COM_TextureOperation.cc b/source/blender/compositor/operations/COM_TextureOperation.cc index 069d00b5e66..f0e661818f8 100644 --- a/source/blender/compositor/operations/COM_TextureOperation.cc +++ b/source/blender/compositor/operations/COM_TextureOperation.cc @@ -102,7 +102,7 @@ void TextureBaseOperation::execute_pixel_sampled(float output[4], float y, PixelSampler sampler) { - TexResult texres = {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, nullptr}; + TexResult texres = {0.0f}; float texture_size[4]; float texture_offset[4]; float vec[3]; 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() |