Merged changes in the trunk up to revision 55546.

Conflicts resolved:
source/blenderplayer/bad_level_call_stubs/SConscript

Partly reverted changes to intern/cycles/blender/addon/ui.py in revision 52899
to make it easier to merge trunk changes.

1 files changed, 14 insertions, 5 deletions

diff --git a/source/blender/compositor/operations/COM_MovieClipOperation.h b/source/blender/compositor/operations/COM_MovieClipOperation.h
index 7cce42f6727..a368dca423c 100644
--- a/source/blender/compositor/operations/COM_MovieClipOperation.h
+++ b/source/blender/compositor/operations/COM_MovieClipOperation.h
@@ -30,11 +30,9 @@
 #include "IMB_imbuf_types.h"
 
 /**
- * Base class for all renderlayeroperations
- *
- * @todo: rename to operation.
+ * Base class for movie clip
  */
-class MovieClipOperation : public NodeOperation {
+class MovieClipBaseOperation : public NodeOperation {
 protected:
 	MovieClip *m_movieClip;
 	MovieClipUser *m_movieClipUser;
@@ -50,7 +48,7 @@ protected:
 	void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]);
 
 public:
-	MovieClipOperation();
+	MovieClipBaseOperation();
 	
 	void initExecution();
 	void deinitExecution();
@@ -62,4 +60,15 @@ public:
 	void executePixel(float output[4], float x, float y, PixelSampler sampler);
 };
 
+class MovieClipOperation : public MovieClipBaseOperation {
+public:
+	MovieClipOperation();
+};
+
+class MovieClipAlphaOperation : public MovieClipBaseOperation {
+public:
+	MovieClipAlphaOperation();
+	void executePixel(float output[4], float x, float y, PixelSampler sampler);
+};
+
 #endif