From 507a4deef1492b1f44af89783e64401727be6f33 Mon Sep 17 00:00:00 2001
From: Sergey Sharybin <sergey@blender.org>
Date: Thu, 10 Feb 2022 10:42:25 +0100
Subject: Fix invalid creation of partial image updater

---
 source/blender/draw/engines/image/image_partial_updater.hh | 12 ++++++------
 1 file 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()
-- 
cgit v1.2.3


From 5312cf50a1f71f9baa63d516f1e5eef728339efb Mon Sep 17 00:00:00 2001
From: Sergey Sharybin <sergey@blender.org>
Date: Thu, 10 Feb 2022 10:46:06 +0100
Subject: Fix strict warning initializing texture result in compositor

From a strict language point of view the code required a braces around
`trgba` initialization. But it is easier to rely on the fact that fields
which are not specified are zero-initialized.
---
 source/blender/compositor/operations/COM_TextureOperation.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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];
-- 
cgit v1.2.3