[Bf-blender-cvs] [9863f5359f9] temp-T96710-pbvh-pixels: Disable pixel package sorting.

Jeroen Bakker noreply at git.blender.org
Fri Apr 8 16:34:18 CEST 2022


Commit: 9863f5359f9f0e675c8c5e187d1e866749ecbafb
Author: Jeroen Bakker
Date:   Fri Apr 8 16:34:14 2022 +0200
Branches: temp-T96710-pbvh-pixels
https://developer.blender.org/rB9863f5359f9f0e675c8c5e187d1e866749ecbafb

Disable pixel package sorting.

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

M	source/blender/blenkernel/intern/pbvh_pixels.cc

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

diff --git a/source/blender/blenkernel/intern/pbvh_pixels.cc b/source/blender/blenkernel/intern/pbvh_pixels.cc
index 57259973438..35d72cf1741 100644
--- a/source/blender/blenkernel/intern/pbvh_pixels.cc
+++ b/source/blender/blenkernel/intern/pbvh_pixels.cc
@@ -479,12 +479,15 @@ void BKE_pbvh_pixels_mark_image_dirty(PBVHNode &node, Image &image, ImageUser &i
 
 void PixelPackages::sort()
 {
+  /* This fails when using GCC. (read out of bounds.) */
+  #if 0
   std::sort(this->begin(), this->end(), [](const PixelsPackage &a, const PixelsPackage &b) {
     if (a.start_image_coordinate[1] < b.start_image_coordinate[1]) {
       return true;
     }
     return a.start_image_coordinate[0] < b.start_image_coordinate[0];
   });
+  #endif
 }
 
 }  // namespace blender::bke::pbvh::pixels



More information about the Bf-blender-cvs mailing list