svn merge ^/trunk/blender -r48288:48302
[blender.git] / source / blender / compositor / operations / COM_ViewerBaseOperation.cpp
index 7466198a4c4d92fe9f694c9f5399199aaf2d0655..141e8d0eeff871ec5b37521279439b7607ee0786 100644 (file)
@@ -42,10 +42,10 @@ ViewerBaseOperation::ViewerBaseOperation() : NodeOperation()
 {
        this->setImage(NULL);
        this->setImageUser(NULL);
-       this->outputBuffer = NULL;
-       this->outputBufferDisplay = NULL;
-       this->active = false;
-       this->doColorManagement = true;
+       this->m_outputBuffer = NULL;
+       this->m_outputBufferDisplay = NULL;
+       this->m_active = false;
+       this->m_doColorManagement = true;
 }
 
 void ViewerBaseOperation::initExecution()
@@ -57,8 +57,8 @@ void ViewerBaseOperation::initExecution()
 
 void ViewerBaseOperation::initImage()
 {
-       Image *anImage = this->image;
-       ImBuf *ibuf = BKE_image_acquire_ibuf(anImage, this->imageUser, &this->lock);
+       Image *anImage = this->m_image;
+       ImBuf *ibuf = BKE_image_acquire_ibuf(anImage, this->m_imageUser, &this->m_lock);
        
        if (!ibuf) return;
        if (ibuf->x != (int)getWidth() || ibuf->y != (int)getHeight()) {
@@ -75,10 +75,10 @@ void ViewerBaseOperation::initImage()
        imb_freerectviewImBuf_all(ibuf);
 
        /* now we combine the input with ibuf */
-       this->outputBuffer = ibuf->rect_float;
-       this->outputBufferDisplay = (unsigned char *)ibuf->rect;
+       this->m_outputBuffer = ibuf->rect_float;
+       this->m_outputBufferDisplay = (unsigned char *)ibuf->rect;
        
-       BKE_image_release_ibuf(this->image, this->lock);
+       BKE_image_release_ibuf(this->m_image, this->m_lock);
 }
 void ViewerBaseOperation:: updateImage(rcti *rect)
 {
@@ -87,11 +87,11 @@ void ViewerBaseOperation:: updateImage(rcti *rect)
 
 void ViewerBaseOperation::deinitExecution()
 {
-       ImBuf *ibuf = BKE_image_acquire_ibuf(this->image, this->imageUser, &this->lock);
+       ImBuf *ibuf = BKE_image_acquire_ibuf(this->m_image, this->m_imageUser, &this->m_lock);
        imb_freerectviewImBuf_all(ibuf);
-       BKE_image_release_ibuf(this->image, this->lock);
+       BKE_image_release_ibuf(this->m_image, this->m_lock);
 
-       this->outputBuffer = NULL;
+       this->m_outputBuffer = NULL;
 }
 
 const CompositorPriority ViewerBaseOperation::getRenderPriority() const