diff options
| author | Jeroen Bakker <j.bakker@atmind.nl> | 2012-05-16 12:18:09 +0400 |
|---|---|---|
| committer | Jeroen Bakker <j.bakker@atmind.nl> | 2012-05-16 12:18:09 +0400 |
| commit | 61fa44b6fc0eebe9c9235bbd4c2df6f4f89f0ebe (patch) | |
| tree | e38189d6b02c90bc88f21a63ebcf0acfe2543c48 | |
| parent | c8b752bc7364a89cf521cfdcd841efa7ac5f00dc (diff) | |
TileBranch
* Bokeh blur fix for depth buffers
* Switch rename sockets
| -rw-r--r-- | source/blender/compositor/nodes/COM_BokehBlurNode.cpp | 6 | ||||
| -rw-r--r-- | source/blender/nodes/composite/nodes/node_composite_switch.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/compositor/nodes/COM_BokehBlurNode.cpp b/source/blender/compositor/nodes/COM_BokehBlurNode.cpp index cf3ccb35b16..ad8f628b3c2 100644 --- a/source/blender/compositor/nodes/COM_BokehBlurNode.cpp +++ b/source/blender/compositor/nodes/COM_BokehBlurNode.cpp @@ -34,14 +34,14 @@ BokehBlurNode::BokehBlurNode(bNode *editorNode): Node(editorNode) { } void BokehBlurNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context) { - bNode *node = this->getbNode(); - Scene *scene= (Scene*)node->id; - Object* camob = (scene)? scene->camera: NULL; + Object* camob = context->getScene()->camera; if (this->getInputSocket(2)->isConnected()) { VariableSizeBokehBlurOperation *operation = new VariableSizeBokehBlurOperation(); ConvertDepthToRadiusOperation *converter = new ConvertDepthToRadiusOperation(); + converter->setfStop(4.0f); converter->setCameraObject(camob); + operation->setMaxBlur(16); this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), true, 0, graph); this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), true, 1, graph); this->getInputSocket(2)->relinkConnections(converter->getInputSocket(0), true, 2, graph); diff --git a/source/blender/nodes/composite/nodes/node_composite_switch.c b/source/blender/nodes/composite/nodes/node_composite_switch.c index 488bc362545..1081e261ccc 100644 --- a/source/blender/nodes/composite/nodes/node_composite_switch.c +++ b/source/blender/nodes/composite/nodes/node_composite_switch.c @@ -35,8 +35,8 @@ /* **************** MIX RGB ******************** */ static bNodeSocketTemplate cmp_node_switch_in[]= { - { SOCK_RGBA, 1, "Image", 0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f}, - { SOCK_RGBA, 1, "Image", 0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f}, + { SOCK_RGBA, 1, "Off", 0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f}, + { SOCK_RGBA, 1, "On", 0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f}, { -1, 0, "" } }; |