From 374ce2cfe5b963eb0005c8b9be04f3edeb6b0f38 Mon Sep 17 00:00:00 2001 From: Ronag Date: Sun, 21 Aug 2011 16:32:30 +0000 Subject: [PATCH] 2.0. image_kernel: Fixed wipe transition, scissor test was incorrect. git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@1252 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d --- core/mixer/image/image_kernel.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/mixer/image/image_kernel.cpp b/core/mixer/image/image_kernel.cpp index 5c0dc5682..8a390c389 100644 --- a/core/mixer/image/image_kernel.cpp +++ b/core/mixer/image/image_kernel.cpp @@ -191,8 +191,8 @@ struct image_kernel::implementation : boost::noncopyable auto m_p = item.transform.clip_translation; auto m_s = item.transform.clip_scale; - bool scissor = m_p[0] > std::numeric_limits::epsilon() || m_p[1] > std::numeric_limits::epsilon() && - m_s[0] < 1.0 - std::numeric_limits::epsilon() || m_s[1] < 1.0 - std::numeric_limits::epsilon(); + bool scissor = m_p[0] > std::numeric_limits::epsilon() || m_p[1] > std::numeric_limits::epsilon() || + m_s[0] < (1.0 - std::numeric_limits::epsilon()) || m_s[1] < (1.0 - std::numeric_limits::epsilon()); if(scissor) { -- 2.39.2