[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56898] trunk/blender/source/blender/ compositor/operations: Comment out coordinates mapping made in rev55469

[Sergey Sharybin]

Revision: 56898
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56898
Author:   nazgul
Date:     2013-05-18 12:21:01 +0000 (Sat, 18 May 2013)
Log Message:
-----------
Comment out coordinates mapping made in rev55469

Such mapping only worked foe compositor output node
(with some issues btw) and failed dramatically for
nodes like previews and viewers.

For now let's behave the same way as border+crop
worked in 2.66 for until proper feature support
is ready (which could take some time).

Fixes #35313: object and ID anti-aliased masks get messed up
              when using border render + crop

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55469

Modified Paths:
--------------
    trunk/blender/source/blender/compositor/operations/COM_CompositorOperation.cpp
    trunk/blender/source/blender/compositor/operations/COM_RenderLayersBaseProg.cpp

Modified: trunk/blender/source/blender/compositor/operations/COM_CompositorOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_CompositorOperation.cpp	2013-05-18 11:37:49 UTC (rev 56897)
+++ trunk/blender/source/blender/compositor/operations/COM_CompositorOperation.cpp	2013-05-18 12:21:01 UTC (rev 56898)
@@ -145,6 +145,7 @@
 	bool breaked = false;
 	int dx = 0, dy = 0;
 
+#if 0
 	const RenderData *rd = this->m_rd;
 
 	if (rd->mode & R_BORDER && rd->mode & R_CROP) {
@@ -181,6 +182,7 @@
 		dx = rd->border.xmin * full_width - (full_width - this->getWidth()) / 2.0f;
 		dy = rd->border.ymin * full_height - (full_height - this->getHeight()) / 2.0f;
 	}
+#endif
 
 	for (y = y1; y < y2 && (!breaked); y++) {
 		for (x = x1; x < x2 && (!breaked); x++) {

Modified: trunk/blender/source/blender/compositor/operations/COM_RenderLayersBaseProg.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_RenderLayersBaseProg.cpp	2013-05-18 11:37:49 UTC (rev 56897)
+++ trunk/blender/source/blender/compositor/operations/COM_RenderLayersBaseProg.cpp	2013-05-18 12:21:01 UTC (rev 56898)
@@ -112,6 +112,7 @@
 
 void RenderLayersBaseProg::executePixel(float output[4], float x, float y, PixelSampler sampler)
 {
+#if 0
 	const RenderData *rd = this->m_rd;
 
 	int dx = 0, dy = 0;
@@ -129,6 +130,10 @@
 
 	int ix = x - dx;
 	int iy = y - dy;
+#else
+	int ix = x;
+	int iy = y;
+#endif
 
 	if (this->m_inputBuffer == NULL || ix < 0 || iy < 0 || ix >= (int)this->getWidth() || iy >= (int)this->getHeight() ) {
 		zero_v4(output);