diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-07-06 13:24:47 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-07-06 13:24:47 +0400 |
| commit | cf369c5e1345fce3d810363fc16235edd7f315a8 (patch) | |
| tree | d3d40b5da3e6ea2afbbb747423fad9fb16da9f37 /source/blender/compositor | |
| parent | f5fe447e0094385e0b41c83666c210d13b7720b3 (diff) | |
| parent | 3b559c8cc86fab02609556d2bbdd92aa3d1c3cba (diff) | |
svn merge ^/trunk/blender -r48658:48674
Diffstat (limited to 'source/blender/compositor')
| -rw-r--r-- | source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp b/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp index 0abf7efdcfa..4627d20ab2f 100644 --- a/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp +++ b/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp @@ -79,9 +79,8 @@ void ExecutionSystemHelper::addNode(vector<Node *>& nodes, Node *node) Node *ExecutionSystemHelper::addNode(vector<Node *>& nodes, bNode *b_node, bool inActiveGroup, bool fast) { - Converter converter; Node *node; - node = converter.convert(b_node, fast); + node = Converter::convert(b_node, fast); node->setIsInActiveGroup(inActiveGroup); if (node != NULL) { addNode(nodes, node); |