[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47910] trunk/blender/source/blender: revert own commits 47907, 47908 after some discussion this is really bad and needs some different solution .

[Campbell Barton]

Revision: 47910
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47910
Author:   campbellbarton
Date:     2012-06-14 16:13:09 +0000 (Thu, 14 Jun 2012)
Log Message:
-----------
revert own commits 47907, 47908 after some discussion this is really bad and needs some different solution.

Modified Paths:
--------------
    trunk/blender/source/blender/compositor/nodes/COM_ScaleNode.cpp
    trunk/blender/source/blender/compositor/operations/COM_ScaleOperation.cpp
    trunk/blender/source/blender/compositor/operations/COM_ScaleOperation.h
    trunk/blender/source/blender/makesdna/DNA_scene_types.h
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_scale.c

Modified: trunk/blender/source/blender/compositor/nodes/COM_ScaleNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_ScaleNode.cpp	2012-06-14 16:12:41 UTC (rev 47909)
+++ trunk/blender/source/blender/compositor/nodes/COM_ScaleNode.cpp	2012-06-14 16:13:09 UTC (rev 47910)
@@ -77,11 +77,6 @@
 		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);

Modified: trunk/blender/source/blender/compositor/operations/COM_ScaleOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_ScaleOperation.cpp	2012-06-14 16:12:41 UTC (rev 47909)
+++ trunk/blender/source/blender/compositor/operations/COM_ScaleOperation.cpp	2012-06-14 16:13:09 UTC (rev 47910)
@@ -136,13 +136,8 @@
 	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();

Modified: trunk/blender/source/blender/compositor/operations/COM_ScaleOperation.h
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_ScaleOperation.h	2012-06-14 16:12:41 UTC (rev 47909)
+++ trunk/blender/source/blender/compositor/operations/COM_ScaleOperation.h	2012-06-14 16:13:09 UTC (rev 47910)
@@ -48,11 +48,6 @@
 	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 @@
 
 	void initExecution();
 	void deinitExecution();
-
-#ifdef USE_SCENE_COMPO_SCALE
-	void setRenderPercentage(float render_perc) { this->render_perc = render_perc; }
-#endif
 };
 
 class ScaleFixedSizeOperation : public NodeOperation {

Modified: trunk/blender/source/blender/makesdna/DNA_scene_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_scene_types.h	2012-06-14 16:12:41 UTC (rev 47909)
+++ trunk/blender/source/blender/makesdna/DNA_scene_types.h	2012-06-14 16:13:09 UTC (rev 47910)
@@ -37,9 +37,6 @@
 /* XXX, temp feature - campbell */
 #define DURIAN_CAMERA_SWITCH
 
-/* XXX - We cant agree on this and it might get deprecated - campbell */
-#define USE_SCENE_COMPO_SCALE
-
 #ifdef __cplusplus
 extern "C" {
 #endif

Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_scale.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_scale.c	2012-06-14 16:12:41 UTC (rev 47909)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_scale.c	2012-06-14 16:13:09 UTC (rev 47910)
@@ -49,12 +49,11 @@
 /* node->custom1 stores if input values are absolute or relative scale */
 static void node_composit_exec_scale(void *data, bNode *node, bNodeStack **in, bNodeStack **out)
 {
-	RenderData *rd = data;
-
 	if (out[0]->hasoutput==0)
 		return;
 	
 	if (in[0]->data) {
+		RenderData *rd = data;
 		CompBuf *stackbuf, *cbuf= typecheck_compbuf(in[0]->data, CB_RGBA);
 		ImBuf *ibuf;
 		int newx, newy;
@@ -115,13 +114,9 @@
 		int a, x, y;
 		float *fp;
 
-#ifdef USE_SCENE_COMPO_SCALE
-		x = MAX2((int)in[1]->vec[0], 1) * (rd->size / 100.0f);
-		y = MAX2((int)in[2]->vec[0], 1) * (rd->size / 100.0f);
-#else
 		x = MAX2((int)in[1]->vec[0], 1);
 		y = MAX2((int)in[2]->vec[0], 1);
-#endif
+
 		stackbuf = alloc_compbuf(x, y, CB_RGBA, 1);
 		fp = stackbuf->rect;