[Bf-blender-cvs] [2778b0690e4] temp-image-buffer-rasterizer: Added back check when 2 verts are on the same rasterline.

Jeroen Bakker noreply at git.blender.org
Fri Feb 18 17:03:53 CET 2022


Commit: 2778b0690e4f315951ce30161fc71a67698f08e2
Author: Jeroen Bakker
Date:   Fri Feb 18 17:03:48 2022 +0100
Branches: temp-image-buffer-rasterizer
https://developer.blender.org/rB2778b0690e4f315951ce30161fc71a67698f08e2

Added back check when 2 verts are on the same rasterline.

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

M	release/datafiles/locale
M	release/scripts/addons
M	source/blender/imbuf/IMB_rasterizer.hh
M	source/tools

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

diff --git a/release/datafiles/locale b/release/datafiles/locale
index 2d12637a69d..af8f04db768 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 2d12637a69df7643484a8a3655b7eeb6faa170a7
+Subproject commit af8f04db7686d1851d3ac9091472ca21989c8ef3
diff --git a/release/scripts/addons b/release/scripts/addons
index e1d44bf3750..b0274e50da5 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit e1d44bf37501eb19a057777bd0b0ba4484773531
+Subproject commit b0274e50da58bc1f0086794a16029ec6e2e9b927
diff --git a/source/blender/imbuf/IMB_rasterizer.hh b/source/blender/imbuf/IMB_rasterizer.hh
index db1f6c6ca9e..05752284f29 100644
--- a/source/blender/imbuf/IMB_rasterizer.hh
+++ b/source/blender/imbuf/IMB_rasterizer.hh
@@ -75,7 +75,7 @@
 
 #include <optional>
 
-#define DEBUG_PRINT
+//#define DEBUG_PRINT
 
 namespace blender::imbuf::rasterizer {
 
@@ -389,6 +389,15 @@ class Rasterizer {
       right += right_add;
     }
 
+    if (min_v == mid_v) {
+      if (sorted_vertices[0]->coord[0] > sorted_vertices[1]->coord[0]) {
+        left = *sorted_vertices[1];
+      }
+      else {
+        right = *sorted_vertices[1];
+      }
+    }
+
     /* When both are the same we should the left/right branches are the same. */
     const float distance_to_midline_anchor_point = clamping_method.distance_to_scanline_anchor(
         sorted_vertices[1]->coord[1]);
diff --git a/source/tools b/source/tools
index 515e67c1932..3fc56d7bc28 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 515e67c1932bc06f24cb50b621265c2a6e8a25a9
+Subproject commit 3fc56d7bc28f83c864c37503700a8a182f77a59b



More information about the Bf-blender-cvs mailing list