Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2011-02-13 17:55:39 +0300
committerTon Roosendaal <ton@blender.org>2011-02-13 17:55:39 +0300
commit0852278ce76fe7412344eeb7e577d0dbdab0ff75 (patch)
tree0157facf712cf547d211421807643b7a20e6c948 /source/blender/nodes/intern
parent4124804b4e67c7a1d15abaac220d08497e37d34a (diff)
Patch 26068
Fast-gauss node didn't respond to socket-input "Size" factor. Thanks Philipp Oeser for the fix!
Diffstat (limited to 'source/blender/nodes/intern')
-rw-r--r--source/blender/nodes/intern/CMP_nodes/CMP_blur.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_blur.c b/source/blender/nodes/intern/CMP_nodes/CMP_blur.c
index 75aca3e0428..238ac87d101 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_blur.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_blur.c
@@ -598,9 +598,8 @@ static void node_composit_exec_blur(void *data, bNode *node, bNodeStack **in, bN
}
else if (nbd->filtertype == R_FILTER_FAST_GAUSS) {
CompBuf *new, *img = in[0]->data;
- /*from eeshlo's original patch, removed to fit in with the existing blur node */
- /*const float sx = in[1]->vec[0], sy = in[2]->vec[0];*/
- const float sx = ((float)nbd->sizex)/2.0f, sy = ((float)nbd->sizey)/2.0f;
+ // TODO: can this be mapped with reference, too?
+ const float sx = ((float)nbd->sizex*in[1]->vec[0])/2.0f, sy = ((float)nbd->sizey*in[1]->vec[0])/2.0f;
int c;
if ((img==NULL) || (out[0]->hasoutput==0)) return;