Merged changes in the trunk up to revision 48505.

1 files changed, 9 insertions, 9 deletions

diff --git a/source/blender/compositor/operations/COM_MovieClipOperation.h b/source/blender/compositor/operations/COM_MovieClipOperation.h
index 454c442a167..2e824009ab6 100644
--- a/source/blender/compositor/operations/COM_MovieClipOperation.h
+++ b/source/blender/compositor/operations/COM_MovieClipOperation.h
@@ -37,12 +37,12 @@
  */
 class MovieClipOperation : public NodeOperation {
 protected:
-	MovieClip *movieClip;
-	MovieClipUser *movieClipUser;
-	ImBuf *movieClipBuffer;
-	int movieClipheight;
-	int movieClipwidth;
-	int framenumber;
+	MovieClip *m_movieClip;
+	MovieClipUser *m_movieClipUser;
+	ImBuf *m_movieClipBuffer;
+	int m_movieClipheight;
+	int m_movieClipwidth;
+	int m_framenumber;
 	
 	/**
 	 * Determine the output resolution. The resolution is retrieved from the Renderer
@@ -54,10 +54,10 @@ public:
 	
 	void initExecution();
 	void deinitExecution();
-	void setMovieClip(MovieClip *image) { this->movieClip = image; }
-	void setMovieClipUser(MovieClipUser *imageuser) { this->movieClipUser = imageuser; }
+	void setMovieClip(MovieClip *image) { this->m_movieClip = image; }
+	void setMovieClipUser(MovieClipUser *imageuser) { this->m_movieClipUser = imageuser; }
 
-	void setFramenumber(int framenumber) { this->framenumber = framenumber; }
+	void setFramenumber(int framenumber) { this->m_framenumber = framenumber; }
 	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 };