revert own commits 47907, 47908 after some discussion this is really bad and needs some different solution.

3 files changed, 0 insertions, 19 deletions

diff --git a/source/blender/compositor/nodes/COM_ScaleNode.cpp b/source/blender/compositor/nodes/COM_ScaleNode.cpp
index 09fd40be31e..fd4e4331fca 100644
--- a/source/blender/compositor/nodes/COM_ScaleNode.cpp
+++ b/source/blender/compositor/nodes/COM_ScaleNode.cpp
@@ -77,11 +77,6 @@ void ScaleNode::convertToOperations(ExecutionSystem *graph, CompositorContext *c
 		case CMP_SCALE_ABSOLUTE: {
 			ScaleAbsoluteOperation *operation = new ScaleAbsoluteOperation(); // TODO: what is the use of this one.... perhaps some issues when the ui was updated....
 
-#ifdef USE_SCENE_COMPO_SCALE
-			const RenderData *data = &context->getScene()->r;
-			operation->setRenderPercentage(data->size / 100.0f);
-#endif
-
 			inputSocket->relinkConnections(operation->getInputSocket(0), 0, graph);
 			inputXSocket->relinkConnections(operation->getInputSocket(1), 1, graph);
 			inputYSocket->relinkConnections(operation->getInputSocket(2), 2, graph);
diff --git a/source/blender/compositor/operations/COM_ScaleOperation.cpp b/source/blender/compositor/operations/COM_ScaleOperation.cpp
index ae640bf7057..f0c3b41b61a 100644
--- a/source/blender/compositor/operations/COM_ScaleOperation.cpp
+++ b/source/blender/compositor/operations/COM_ScaleOperation.cpp
@@ -136,13 +136,8 @@ void ScaleAbsoluteOperation::executePixel(float *color, float x, float y, PixelS
 	this->inputXOperation->read(scaleX, x, y, sampler, inputBuffers);
 	this->inputYOperation->read(scaleY, x, y, sampler, inputBuffers);
 
-#ifdef USE_SCENE_COMPO_SCALE
-	const float scx = scaleX[0] * this->render_perc; // target absolute scale * render_percentage
-	const float scy = scaleY[0] * this->render_perc; // target absolute scale * render_percentage
-#else
 	const float scx = scaleX[0]; // target absolute scale
 	const float scy = scaleY[0]; // target absolute scale
-#endif
 
 	const float width = this->getWidth();
 	const float height = this->getHeight();
diff --git a/source/blender/compositor/operations/COM_ScaleOperation.h b/source/blender/compositor/operations/COM_ScaleOperation.h
index cc666187f36..cf2f878e8bc 100644
--- a/source/blender/compositor/operations/COM_ScaleOperation.h
+++ b/source/blender/compositor/operations/COM_ScaleOperation.h
@@ -48,11 +48,6 @@ class ScaleAbsoluteOperation : public NodeOperation {
 	float centerX;
 	float centerY;
 
-#ifdef USE_SCENE_COMPO_SCALE
-	/* scene->r.size / 100.0f */ /* added after 2.63, this may be done differently/better */
-	float render_perc;
-#endif
-
 public:
 	ScaleAbsoluteOperation();
 	bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
@@ -60,10 +55,6 @@ public:
 
 	void initExecution();
 	void deinitExecution();
-
-#ifdef USE_SCENE_COMPO_SCALE
-	void setRenderPercentage(float render_perc) { this->render_perc = render_perc; }
-#endif
 };
 
 class ScaleFixedSizeOperation : public NodeOperation {