[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46414] branches/tile/source/blender/ compositor/operations: TileBranch

[Jeroen Bakker]

Revision: 46414
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46414
Author:   jbakker
Date:     2012-05-08 10:53:59 +0000 (Tue, 08 May 2012)
Log Message:
-----------
TileBranch
 * removed determine resolution [temporarilly]

Modified Paths:
--------------
    branches/tile/source/blender/compositor/operations/COM_MixBaseOperation.cpp
    branches/tile/source/blender/compositor/operations/COM_MixBaseOperation.h

Modified: branches/tile/source/blender/compositor/operations/COM_MixBaseOperation.cpp
===================================================================
--- branches/tile/source/blender/compositor/operations/COM_MixBaseOperation.cpp	2012-05-08 09:31:25 UTC (rev 46413)
+++ branches/tile/source/blender/compositor/operations/COM_MixBaseOperation.cpp	2012-05-08 10:53:59 UTC (rev 46414)
@@ -63,33 +63,3 @@
 	this->inputColor1Operation = NULL;
 	this->inputColor2Operation = NULL;
 }
-
-void MixBaseOperation::determineResolution(unsigned int resolution[], unsigned int preferredResolution[]) {
-	unsigned int tempPreferred[2];
-	unsigned int facResolution[2];
-	unsigned int color1Resolution[2];
-	unsigned int color2Resolution[2];
-	InputSocket *socket;
-	
-	tempPreferred[0] = 0;
-	tempPreferred[1] = 0;
-	socket = this->getInputSocket(0);
-	socket->determineResolution(facResolution, tempPreferred);
-	tempPreferred[0] = 0;
-	tempPreferred[1] = 0;
-	socket = this->getInputSocket(1);
-	socket->determineResolution(color1Resolution, tempPreferred);
-	tempPreferred[0] = 0;
-	tempPreferred[1] = 0;
-	socket = this->getInputSocket(2);
-	socket->determineResolution(color2Resolution, tempPreferred);
-	
-	if (color1Resolution[0] != 0 && color1Resolution != 0) {
-		this->setResolutionInputSocketIndex(1);
-	} else if (color2Resolution[0] != 0 && color2Resolution != 0) {
-		this->setResolutionInputSocketIndex(2);
-	} else if (facResolution[0] != 0 && facResolution != 0) {
-		this->setResolutionInputSocketIndex(0);
-	}
-	NodeOperation::determineResolution(resolution, preferredResolution);
-}

Modified: branches/tile/source/blender/compositor/operations/COM_MixBaseOperation.h
===================================================================
--- branches/tile/source/blender/compositor/operations/COM_MixBaseOperation.h	2012-05-08 09:31:25 UTC (rev 46413)
+++ branches/tile/source/blender/compositor/operations/COM_MixBaseOperation.h	2012-05-08 10:53:59 UTC (rev 46414)
@@ -61,6 +61,5 @@
 	
 	void setUseValueAlphaMultiply(const bool value) {this->valueAlphaMultiply = value;}
 	bool useValueAlphaMultiply() {return this->valueAlphaMultiply;}
-	void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]);
 };
 #endif