[Bf-blender-cvs] [540bfbbb279] master: Fix T96582: Wipe effect not working

Richard Antalik noreply at git.blender.org
Tue Mar 29 05:13:50 CEST 2022


Commit: 540bfbbb27966b4b8affeaa273a70beac9373b23
Author: Richard Antalik
Date:   Tue Mar 29 05:07:58 2022 +0200
Branches: master
https://developer.blender.org/rB540bfbbb27966b4b8affeaa273a70beac9373b23

Fix T96582: Wipe effect not working

Caused by oversight in 0e38002dd5dd. Constant x/y value was used to
calculate transition instead of pixel x/y coords.

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

M	source/blender/sequencer/intern/effects.c

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

diff --git a/source/blender/sequencer/intern/effects.c b/source/blender/sequencer/intern/effects.c
index 8f7088b0c4b..a4ab7671eb0 100644
--- a/source/blender/sequencer/intern/effects.c
+++ b/source/blender/sequencer/intern/effects.c
@@ -1681,7 +1681,7 @@ static void do_wipe_effect_byte(Sequence *seq,
 
   for (int i = 0; i < y; i++) {
     for (int j = 0; j < x; j++) {
-      float check = check_zone(&wipezone, x, y, seq, fac);
+      float check = check_zone(&wipezone, j, i, seq, fac);
       if (check) {
         if (cp1) {
           float rt1[4], rt2[4], tempc[4];
@@ -1742,7 +1742,7 @@ static void do_wipe_effect_float(
 
   for (int i = 0; i < y; i++) {
     for (int j = 0; j < x; j++) {
-      float check = check_zone(&wipezone, x, y, seq, fac);
+      float check = check_zone(&wipezone, j, i, seq, fac);
       if (check) {
         if (rt1) {
           rt[0] = rt1[0] * check + rt2[0] * (1 - check);



More information about the Bf-blender-cvs mailing list