diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-06-14 20:13:09 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-06-14 20:13:09 +0400 |
commit | 1a39e74131b9dc30cb5daf4dffe3bb17c74f44fc (patch) | |
tree | fff081f5fa2ca68fd54355a329e60a04d6a52a95 | |
parent | 0b2fcf43680eb0c6877bd111580fa98ae7ccb7e7 (diff) |
revert own commits 47907, 47908 after some discussion this is really bad and needs some different solution.
5 files changed, 2 insertions, 29 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 { diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 33b28a6abff..3bceb0277d5 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -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 diff --git a/source/blender/nodes/composite/nodes/node_composite_scale.c b/source/blender/nodes/composite/nodes/node_composite_scale.c index 90ab485af75..9a25a62b981 100644 --- a/source/blender/nodes/composite/nodes/node_composite_scale.c +++ b/source/blender/nodes/composite/nodes/node_composite_scale.c @@ -49,12 +49,11 @@ static bNodeSocketTemplate cmp_node_scale_out[]= { /* 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 @@ static void node_composit_exec_scale(void *data, bNode *node, bNodeStack **in, b 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; |