← Back to branch summary

~ubuntu-branches/ubuntu/utopic/blender/utopic-proposed

« back to all changes in this revision

Viewing changes to source/blender/compositor/nodes/COM_AlphaOverNode.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/nodes/COM_AlphaOverNode.cpp
22
22
 
23
23
#include "COM_AlphaOverNode.h"
24
24
 
25
 
#include "COM_MixBaseOperation.h"
 
25
#include "COM_MixOperation.h"
26
26
#include "COM_AlphaOverKeyOperation.h"
27
27
#include "COM_AlphaOverMixedOperation.h"
28
28
#include "COM_AlphaOverPremultiplyOperation.h"