Revision: 46533
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46533
Author:   jbakker
Date:     2012-05-10 20:48:36 +0000 (Thu, 10 May 2012)
Log Message:
-----------
TileBranch
 * fixed for [#31298] plugging anything into size socket of blur node
does nothing

Modified Paths:
--------------
    
branches/tile/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp
    
branches/tile/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
    
branches/tile/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
    
branches/tile/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp

Modified: 
branches/tile/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp
===================================================================
--- 
branches/tile/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp
        2012-05-10 20:36:34 UTC (rev 46532)
+++ 
branches/tile/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp
        2012-05-10 20:48:36 UTC (rev 46533)
@@ -36,9 +36,14 @@
 
 bool FastGaussianBlurOperation::determineDependingAreaOfInterest(rcti *input, 
ReadBufferOperation *readOperation, rcti *output){
        rcti newInput;
+       rcti sizeInput;
+       sizeInput.xmin = 0;
+       sizeInput.ymin = 0;
+       sizeInput.xmax = 5;
+       sizeInput.ymax = 5;
        
        NodeOperation * operation = this->getInputOperation(1);
-       if (operation->determineDependingAreaOfInterest(input, readOperation, 
output)) {
+       if (operation->determineDependingAreaOfInterest(&sizeInput, 
readOperation, output)) {
                return true;
        }else {
                if(this->iirgaus){

Modified: 
branches/tile/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
===================================================================
--- 
branches/tile/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
       2012-05-10 20:36:34 UTC (rev 46532)
+++ 
branches/tile/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
       2012-05-10 20:48:36 UTC (rev 46533)
@@ -146,9 +146,14 @@
 
 bool GaussianBokehBlurOperation::determineDependingAreaOfInterest(rcti *input, 
ReadBufferOperation *readOperation, rcti *output) {
        rcti newInput;
+       rcti sizeInput;
+       sizeInput.xmin = 0;
+       sizeInput.ymin = 0;
+       sizeInput.xmax = 5;
+       sizeInput.ymax = 5;
+       NodeOperation * operation = this->getInputOperation(1);
        
-       NodeOperation * operation = this->getInputOperation(1);
-       if (operation->determineDependingAreaOfInterest(input, readOperation, 
output)) {
+       if (operation->determineDependingAreaOfInterest(&sizeInput, 
readOperation, output)) {
                return true;
        } else {
                if (this->gausstab) {

Modified: 
branches/tile/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
===================================================================
--- 
branches/tile/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
   2012-05-10 20:36:34 UTC (rev 46532)
+++ 
branches/tile/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
   2012-05-10 20:48:36 UTC (rev 46533)
@@ -102,9 +102,14 @@
 
 bool GaussianXBlurOperation::determineDependingAreaOfInterest(rcti *input, 
ReadBufferOperation *readOperation, rcti *output) {
        rcti newInput;
+       rcti sizeInput;
+       sizeInput.xmin = 0;
+       sizeInput.ymin = 0;
+       sizeInput.xmax = 5;
+       sizeInput.ymax = 5;
        
        NodeOperation * operation = this->getInputOperation(1);
-       if (operation->determineDependingAreaOfInterest(input, readOperation, 
output)) {
+       if (operation->determineDependingAreaOfInterest(&sizeInput, 
readOperation, output)) {
                return true;
        }else {
                if (this->gausstab == NULL) {

Modified: 
branches/tile/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
===================================================================
--- 
branches/tile/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
   2012-05-10 20:36:34 UTC (rev 46532)
+++ 
branches/tile/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
   2012-05-10 20:48:36 UTC (rev 46533)
@@ -99,9 +99,14 @@
 
 bool GaussianYBlurOperation::determineDependingAreaOfInterest(rcti *input, 
ReadBufferOperation *readOperation, rcti *output) {
        rcti newInput;
+       rcti sizeInput;
+       sizeInput.xmin = 0;
+       sizeInput.ymin = 0;
+       sizeInput.xmax = 5;
+       sizeInput.ymax = 5;
        
        NodeOperation * operation = this->getInputOperation(1);
-       if (operation->determineDependingAreaOfInterest(input, readOperation, 
output)) {
+       if (operation->determineDependingAreaOfInterest(&sizeInput, 
readOperation, output)) {
                return true;
        }else {
                if (this->gausstab == NULL) {

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to