← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty-proposed

« back to all changes in this revision

Viewing changes to source/blender/compositor/nodes/COM_BokehBlurNode.cpp

  • Committer: Package Import Robot
  • Author(s): Matteo F. Vescovi
  • Date: 2013-08-14 10:43:49 UTC
  • mfrom: (14.2.19 sid)
  • Revision ID: package-import@ubuntu.com-20130814104349-t1d5mtwkphp12dyj
Tags: 2.68a-3
* Upload to unstable
* debian/: python3.3 Depends simplified
  - debian/control: python3.3 Depends dropped
    for blender-data package
  - 0001-blender_thumbnailer.patch refreshed
* debian/control: libavcodec b-dep versioning dropped

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/compositor/nodes/COM_BokehBlurNode.cpp
60
60
        else {
61
61
                BokehBlurOperation *operation = new BokehBlurOperation();
62
62
 
63
 
                const bNodeSocket *sock = this->getInputSocket(2)->getbNodeSocket();
64
 
                const float size = ((const bNodeSocketValueFloat *)sock->default_value)->value;
65
 
 
66
63
                this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph);
67
64
                this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), 1, graph);
68
65
                this->getInputSocket(2)->relinkConnections(operation->getInputSocket(3), 2, graph);
69
66
                this->getInputSocket(3)->relinkConnections(operation->getInputSocket(2), 3, graph);
70
 
                //operation->setSize(((bNodeSocketValueFloat *)this->getInputSocket(2)->getbNodeSocket()->default_value)->value);
71
67
                operation->setQuality(context->getQuality());
72
68
                operation->setbNode(this->getbNode());
73
69
                graph->addOperation(operation);
74
70
                this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket());
75
71
 
76
72
                if (!connectedSizeSocket) {
77
 
                        operation->setSize(size);
 
73
                        operation->setSize(this->getInputSocket(2)->getEditorValueFloat());
78
74
                }
79
75
        }
80
76
}