[Bf-blender-cvs] [507a4deef14] blender-v3.1-release: Fix invalid creation of partial image updater

Sergey Sharybin noreply at git.blender.org
Thu Feb 10 10:47:38 CET 2022


Commit: 507a4deef1492b1f44af89783e64401727be6f33
Author: Sergey Sharybin
Date:   Thu Feb 10 10:42:25 2022 +0100
Branches: blender-v3.1-release
https://developer.blender.org/rB507a4deef1492b1f44af89783e64401727be6f33

Fix invalid creation of partial image updater

===================================================================

M	source/blender/draw/engines/image/image_partial_updater.hh

===================================================================

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()



More information about the Bf-blender-cvs mailing list