← Back to branch summary

~siretart/ubuntu/utopic/blender/libav10

« back to all changes in this revision

Viewing changes to source/blender/compositor/intern/COM_Converter.cpp

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2014-02-19 11:24:23 UTC
  • mfrom: (14.2.23 sid)
  • Revision ID: package-import@ubuntu.com-20140219112423-rkmaz2m7ha06d4tk
Tags: 2.69-3ubuntu1
* Merge with Debian; remaining changes:
  - Configure without OpenImageIO on armhf, as it is not available on
    Ubuntu.

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/compositor/intern/COM_Converter.cpp
47
47
#include "COM_CombineYUVANode.h"
48
48
#include "COM_CompositorNode.h"
49
49
#include "COM_ConvertAlphaNode.h"
50
 
#include "COM_ConvertColorToVectorOperation.h"
51
 
#include "COM_ConvertColorToValueProg.h"
52
 
#include "COM_ConvertValueToColorProg.h"
53
 
#include "COM_ConvertValueToVectorOperation.h"
54
 
#include "COM_ConvertVectorToColorOperation.h"
55
 
#include "COM_ConvertVectorToValueOperation.h"
 
50
#include "COM_ConvertOperation.h"
56
51
#include "COM_Converter.h"
57
52
#include "COM_CropNode.h"
58
53
#include "COM_DefocusNode.h"
121
116
#include "COM_ViewerNode.h"
122
117
#include "COM_ZCombineNode.h"
123
118
#include "COM_PixelateNode.h"
 
119
#include "COM_PlaneTrackDeformNode.h"
124
120
 
125
121
Node *Converter::convert(bNode *b_node, bool fast)
126
122
{
402
398
                case CMP_NODE_PIXELATE:
403
399
                        node = new PixelateNode(b_node);
404
400
                        break;
 
401
                case CMP_NODE_PLANETRACKDEFORM:
 
402
                        node = new PlaneTrackDeformNode(b_node);
 
403
                        break;
405
404
                default:
406
405
                        node = new MuteNode(b_node);
407
406
                        break;
416
415
        DataType toDatatype = inputSocket->getDataType();
417
416
        NodeOperation *converter = NULL;
418
417
        if (fromDatatype == COM_DT_VALUE && toDatatype == COM_DT_COLOR) {
419
 
                converter = new ConvertValueToColorProg();
 
418
                converter = new ConvertValueToColorOperation();
420
419
        }
421
420
        else if (fromDatatype == COM_DT_VALUE && toDatatype == COM_DT_VECTOR) {
422
421
                converter = new ConvertValueToVectorOperation();
423
422
        }
424
423
        else if (fromDatatype == COM_DT_COLOR && toDatatype == COM_DT_VALUE) {
425
 
                converter = new ConvertColorToValueProg();
 
424
                converter = new ConvertColorToValueOperation();
426
425
        }
427
426
        else if (fromDatatype == COM_DT_COLOR && toDatatype == COM_DT_VECTOR) {
428
427
                converter = new ConvertColorToVectorOperation();