[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46682] branches/tile/source/blender: TileBranch
Jeroen Bakker
j.bakker at atmind.nl
Wed May 16 10:18:09 CEST 2012
Revision: 46682
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46682
Author: jbakker
Date: 2012-05-16 08:18:09 +0000 (Wed, 16 May 2012)
Log Message:
-----------
TileBranch
* Bokeh blur fix for depth buffers
* Switch rename sockets
Modified Paths:
--------------
branches/tile/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
branches/tile/source/blender/nodes/composite/nodes/node_composite_switch.c
Modified: branches/tile/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
===================================================================
--- branches/tile/source/blender/compositor/nodes/COM_BokehBlurNode.cpp 2012-05-16 07:38:23 UTC (rev 46681)
+++ branches/tile/source/blender/compositor/nodes/COM_BokehBlurNode.cpp 2012-05-16 08:18:09 UTC (rev 46682)
@@ -34,14 +34,14 @@
}
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);
Modified: branches/tile/source/blender/nodes/composite/nodes/node_composite_switch.c
===================================================================
--- branches/tile/source/blender/nodes/composite/nodes/node_composite_switch.c 2012-05-16 07:38:23 UTC (rev 46681)
+++ branches/tile/source/blender/nodes/composite/nodes/node_composite_switch.c 2012-05-16 08:18:09 UTC (rev 46682)
@@ -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, "" }
};
More information about the Bf-blender-cvs
mailing list