[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59191] trunk/blender/source/blender/ compositor/operations: Remove ifdef-ed code, it's still in SVn anyway.

[Sergey Sharybin]

Revision: 59191
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59191
Author:   nazgul
Date:     2013-08-16 13:58:39 +0000 (Fri, 16 Aug 2013)
Log Message:
-----------
Remove ifdef-ed code, it's still in SVn anyway.

Modified Paths:
--------------
    trunk/blender/source/blender/compositor/operations/COM_MapUVOperation.cpp
    trunk/blender/source/blender/compositor/operations/COM_PlaneTrackWarpImageOperation.cpp

Modified: trunk/blender/source/blender/compositor/operations/COM_MapUVOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_MapUVOperation.cpp	2013-08-16 13:58:34 UTC (rev 59190)
+++ trunk/blender/source/blender/compositor/operations/COM_MapUVOperation.cpp	2013-08-16 13:58:39 UTC (rev 59191)
@@ -71,41 +71,12 @@
 
 	dy = 0.5f * (uv_u + uv_d);
 
-#if 0
-	/* more adaptive sampling, red and green (UV) channels */
-	this->m_inputUVProgram->read(uv_a, x - 1, y - 1, COM_PS_NEAREST);
-	this->m_inputUVProgram->read(uv_b, x - 1, y + 1, COM_PS_NEAREST);
-	uv_l = uv_a[2] != 0.f ? fabsf(inputUV[0] - uv_a[0]) : 0.f;
-	uv_r = uv_b[2] != 0.f ? fabsf(inputUV[0] - uv_b[0]) : 0.f;
-	uv_u = uv_a[2] != 0.f ? fabsf(inputUV[1] - uv_a[1]) : 0.f;
-	uv_d = uv_b[2] != 0.f ? fabsf(inputUV[1] - uv_b[1]) : 0.f;
-
-	dx += 0.25f * (uv_l + uv_r);
-	dy += 0.25f * (uv_u + uv_d);
-
-	this->m_inputUVProgram->read(uv_a, x + 1, y - 1, COM_PS_NEAREST);
-	this->m_inputUVProgram->read(uv_b, x + 1, y + 1, COM_PS_NEAREST);
-	uv_l = uv_a[2] != 0.f ? fabsf(inputUV[0] - uv_a[0]) : 0.f;
-	uv_r = uv_b[2] != 0.f ? fabsf(inputUV[0] - uv_b[0]) : 0.f;
-	uv_u = uv_a[2] != 0.f ? fabsf(inputUV[1] - uv_a[1]) : 0.f;
-	uv_d = uv_b[2] != 0.f ? fabsf(inputUV[1] - uv_b[1]) : 0.f;
-
-	dx += 0.25f * (uv_l + uv_r);
-	dy += 0.25f * (uv_u + uv_d);
-#endif
-
 	/* UV to alpha threshold */
 	const float threshold = this->m_alpha * 0.05f;
 	float alpha = 1.0f - threshold * (dx + dy);
 	if (alpha < 0.f) alpha = 0.f;
 	else alpha *= inputUV[2];
 
-#if 0
-	/* should use mipmap */
-	dx = min(dx, 0.2f);
-	dy = min(dy, 0.2f);
-#endif
-
 	/* EWA filtering */
 	u = inputUV[0] * this->m_inputColorProgram->getWidth();
 	v = inputUV[1] * this->m_inputColorProgram->getHeight();

Modified: trunk/blender/source/blender/compositor/operations/COM_PlaneTrackWarpImageOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_PlaneTrackWarpImageOperation.cpp	2013-08-16 13:58:34 UTC (rev 59190)
+++ trunk/blender/source/blender/compositor/operations/COM_PlaneTrackWarpImageOperation.cpp	2013-08-16 13:58:39 UTC (rev 59191)
@@ -93,35 +93,8 @@
 
 	dy = 0.5f * (uv_u + uv_d);
 
-#if 0
-	/* more adaptive sampling, red and green (UV) channels */
-	ok1 = resolveUV(x - 1, y - 1, corners, uv_a);
-	ok2 = resolveUV(x - 1, y + 1, corners, uv_b);
-	uv_l = ok1 ? fabsf(inputUV[0] - uv_a[0]) : 0.f;
-	uv_r = ok2 ? fabsf(inputUV[0] - uv_b[0]) : 0.f;
-	uv_u = ok1 ? fabsf(inputUV[1] - uv_a[1]) : 0.f;
-	uv_d = ok2 ? fabsf(inputUV[1] - uv_b[1]) : 0.f;
-
-	dx += 0.25f * (uv_l + uv_r);
-	dy += 0.25f * (uv_u + uv_d);
-
-	ok1 = resolveUV(x + 1, y - 1, corners, uv_a);
-	ok2 = resolveUV(x + 1, y + 1, corners, uv_b);
-	uv_l = ok1 ? fabsf(inputUV[0] - uv_a[0]) : 0.f;
-	uv_r = ok2 ? fabsf(inputUV[0] - uv_b[0]) : 0.f;
-	uv_u = ok1 ? fabsf(inputUV[1] - uv_a[1]) : 0.f;
-	uv_d = ok2 ? fabsf(inputUV[1] - uv_b[1]) : 0.f;
-
-	dx += 0.25f * (uv_l + uv_r);
-	dy += 0.25f * (uv_u + uv_d);
-
-	/* should use mipmap */
-	*dx_r = min(dx, 0.2f);
-	*dy_r = min(dy, 0.2f);
-#else
 	*dx_r = dx;
 	*dy_r = dy;
-#endif
 
 	*u_r = inputUV[0];
 	*v_r = inputUV[1];