← Back to branch summary

~siretart/ubuntu/utopic/blender/libav10

« back to all changes in this revision

Viewing changes to source/blender/compositor/operations/COM_MultilayerImageOperation.h

  • 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/operations/COM_MultilayerImageOperation.h
37
37
        /**
38
38
         * Constructor
39
39
         */
40
 
        MultilayerBaseOperation(int pass);
 
40
        MultilayerBaseOperation(int passindex);
41
41
        void setRenderLayer(RenderLayer *renderlayer) { this->m_renderlayer = renderlayer; }
42
42
};
43
43
 
44
44
class MultilayerColorOperation : public MultilayerBaseOperation {
45
45
public:
46
 
        MultilayerColorOperation(int pass) : MultilayerBaseOperation(pass) {
 
46
        MultilayerColorOperation(int passindex) : MultilayerBaseOperation(passindex) {
47
47
                this->addOutputSocket(COM_DT_COLOR);
48
48
        }
49
49
        void executePixel(float output[4], float x, float y, PixelSampler sampler);
51
51
 
52
52
class MultilayerValueOperation : public MultilayerBaseOperation {
53
53
public:
54
 
        MultilayerValueOperation(int pass) : MultilayerBaseOperation(pass) {
 
54
        MultilayerValueOperation(int passindex) : MultilayerBaseOperation(passindex) {
55
55
                this->addOutputSocket(COM_DT_VALUE);
56
56
        }
57
57
        void executePixel(float output[4], float x, float y, PixelSampler sampler);
59
59
 
60
60
class MultilayerVectorOperation : public MultilayerBaseOperation {
61
61
public:
62
 
        MultilayerVectorOperation(int pass) : MultilayerBaseOperation(pass) {
 
62
        MultilayerVectorOperation(int passindex) : MultilayerBaseOperation(passindex) {
63
63
                this->addOutputSocket(COM_DT_VECTOR);
64
64
        }
65
65
        void executePixel(float output[4], float x, float y, PixelSampler sampler);