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 /source/blender/compositor/operations | |
parent | 0b2fcf43680eb0c6877bd111580fa98ae7ccb7e7 (diff) |
revert own commits 47907, 47908 after some discussion this is really bad and needs some different solution.
Diffstat (limited to 'source/blender/compositor/operations')
-rw-r--r-- | source/blender/compositor/operations/COM_ScaleOperation.cpp | 5 | ||||
-rw-r--r-- | source/blender/compositor/operations/COM_ScaleOperation.h | 9 |
2 files changed, 0 insertions, 14 deletions
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 { |