Merge branch 'master'

diff --git a/blur_effect.frag b/blur_effect.frag
index 8853854229038c067b0ab8f677008a24d67e64b7..afe9f2e4cc001247d51b2a9e214348d6f55ce327 100644 (file)
--- a/blur_effect.frag
+++ b/blur_effect.frag
@@ -22,3 +22,5 @@ vec4 FUNCNAME(vec2 tc) {
        }
        return sum;
 }
+
+#undef DIRECTION_VERTICAL

diff --git a/fft_pass_effect.frag b/fft_pass_effect.frag
index edcf6951815b1a9a1a09906f3082dad5ff36ef63..fcffba786facade26a2ad2983126675528107708 100644 (file)
--- a/fft_pass_effect.frag
+++ b/fft_pass_effect.frag
@@ -22,3 +22,5 @@ vec4 FUNCNAME(vec2 tc) {
        // where * is complex multiplication.
        return c1 + support.z * c2 + support.w * vec4(-c2.y, c2.x, -c2.w, c2.z);
 }
+
+#undef DIRECTION_VERTICAL

diff --git a/slice_effect.frag b/slice_effect.frag
index 59e3cc10de2c474f90a8ff25b54d10815c180c06..e77c9fad7bf39e38444724d5879df64710f074f4 100644 (file)
--- a/slice_effect.frag
+++ b/slice_effect.frag
@@ -25,3 +25,5 @@ vec4 FUNCNAME(vec2 tc) {
        return INPUT(vec2(input_coord, tc.y));
 #endif
 }
+
+#undef DIRECTION_VERTICAL