[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46283] branches/tile/source/blender/ compositor: fix for [#31274] Black border around image texture applied to geometry with UV pass

[Dalai Felinto]

Revision: 46283
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46283
Author:   dfelinto
Date:     2012-05-04 15:02:31 +0000 (Fri, 04 May 2012)
Log Message:
-----------
fix for [#31274] Black border around image texture applied to geometry with UV pass

Modified Paths:
--------------
    branches/tile/source/blender/compositor/nodes/COM_MapUVNode.cpp
    branches/tile/source/blender/compositor/operations/COM_MapUVOperation.cpp

Modified: branches/tile/source/blender/compositor/nodes/COM_MapUVNode.cpp
===================================================================
--- branches/tile/source/blender/compositor/nodes/COM_MapUVNode.cpp	2012-05-04 15:02:02 UTC (rev 46282)
+++ branches/tile/source/blender/compositor/nodes/COM_MapUVNode.cpp	2012-05-04 15:02:31 UTC (rev 46283)
@@ -35,6 +35,7 @@
 	
 	bNode* node = this->getbNode();
 	operation->setAlpha((float)node->custom1);
+	operation->setResolutionInputSocketIndex(1);
 
 	graph->addOperation(operation);
 }

Modified: branches/tile/source/blender/compositor/operations/COM_MapUVOperation.cpp
===================================================================
--- branches/tile/source/blender/compositor/operations/COM_MapUVOperation.cpp	2012-05-04 15:02:02 UTC (rev 46282)
+++ branches/tile/source/blender/compositor/operations/COM_MapUVOperation.cpp	2012-05-04 15:02:31 UTC (rev 46283)
@@ -104,8 +104,8 @@
 
 
 	/* EWA filtering */
-	u = inputUV[0] * this->width;
-	v = inputUV[1] * this->height;
+	u = inputUV[0] * inputColorProgram->getWidth();
+	v = inputUV[1] * inputColorProgram->getHeight();
 
 	this->inputColorProgram->read(color, u, v, dx, dy, inputBuffers);