[Bf-blender-cvs] [ead84d2ba68] blender-v3.1-release: Fix building error in previous commit.

Jeroen Bakker noreply at git.blender.org
Tue Mar 1 08:53:46 CET 2022


Commit: ead84d2ba6895dd0d9e62711eef4ef46ab9b3fc2
Author: Jeroen Bakker
Date:   Tue Mar 1 08:53:23 2022 +0100
Branches: blender-v3.1-release
https://developer.blender.org/rBead84d2ba6895dd0d9e62711eef4ef46ab9b3fc2

Fix building error in previous commit.

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

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

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

diff --git a/source/blender/draw/engines/image/image_drawing_mode.hh b/source/blender/draw/engines/image/image_drawing_mode.hh
index f0f7f221069..4564ef87025 100644
--- a/source/blender/draw/engines/image/image_drawing_mode.hh
+++ b/source/blender/draw/engines/image/image_drawing_mode.hh
@@ -219,30 +219,17 @@ template<typename TextureMethod> class ScreenSpaceDrawingMode : public AbstractD
   }
 
   /**
-   * Update the float buffer.
-   *
-   * TODO(jbakker): This is a very expensive operation and should be optimized to perform the
-   * color space conversion + alpha premultiplication on a part of the buffer.
-   * Basically perform a float_from_rect on a given rectangle.
+   * Update the float buffer in the region given by the partial update checker.
    */
   void do_partial_update_float_buffer(
       ImBuf *float_buffer, PartialUpdateChecker<ImageTileData>::CollectResult &iterator) const
   {
-#if 0
-    ImBuf *src = iterator.tile_data.tile_buffer;
-    src->rect_float = float_buffer->rect_float;
-    IMB_float_from_rect(src);
-
-    src->rect_float = nullptr;
-#else
     ImBuf *src = iterator.tile_data.tile_buffer;
-    BLI_assert(float_buffer->float_rect != nullptr);
+    BLI_assert(float_buffer->rect_float != nullptr);
     BLI_assert(float_buffer->rect == nullptr);
-    BLI_assert(src->float_rect == nullptr);
+    BLI_assert(src->rect_float == nullptr);
     BLI_assert(src->rect != nullptr);
     IMB_float_from_rect_ex(float_buffer, src, &iterator.changed_region.region);
-
-#endif
   }
 
   void do_partial_update(PartialUpdateChecker<ImageTileData>::CollectResult &iterator,



More information about the Bf-blender-cvs mailing list