diff options
author | Nicholas Bishop <nicholasbishop@gmail.com> | 2010-10-19 04:45:37 +0400 |
---|---|---|
committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2010-10-19 04:45:37 +0400 |
commit | a377a7edf67869722c585086ac6ab1f295cbff87 (patch) | |
tree | 1736de08fe9174761607dce5d54a16af25eba049 /source/gameengine/VideoTexture/ImageBuff.cpp | |
parent | 08232350d5797302e3638e69ec78657d853976aa (diff) | |
parent | b743454ce1c361e6161da8ae5f840c2befe3a081 (diff) |
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r32300:32571soc-2010-nicolasbishop
Diffstat (limited to 'source/gameengine/VideoTexture/ImageBuff.cpp')
-rw-r--r-- | source/gameengine/VideoTexture/ImageBuff.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/gameengine/VideoTexture/ImageBuff.cpp b/source/gameengine/VideoTexture/ImageBuff.cpp index 926468c662e..b8a67ccfc40 100644 --- a/source/gameengine/VideoTexture/ImageBuff.cpp +++ b/source/gameengine/VideoTexture/ImageBuff.cpp @@ -147,10 +147,10 @@ void ImageBuff::plot (unsigned char * img, short width, short height, short x, s if (!m_imbuf) { // allocate most basic imbuf, we will assign the rect buffer on the fly - m_imbuf = IMB_allocImBuf(m_size[0], m_size[1], 0, 0, 0); + m_imbuf = IMB_allocImBuf(m_size[0], m_size[1], 0, 0); } - tmpbuf = IMB_allocImBuf(width, height, 0, 0, 0); + tmpbuf = IMB_allocImBuf(width, height, 0, 0); // assign temporarily our buffer to the ImBuf buffer, we use the same format tmpbuf->rect = (unsigned int*)img; @@ -169,11 +169,11 @@ void ImageBuff::plot (ImageBuff* img, short x, short y, short mode) if (!m_imbuf) { // allocate most basic imbuf, we will assign the rect buffer on the fly - m_imbuf = IMB_allocImBuf(m_size[0], m_size[1], 0, 0, 0); + m_imbuf = IMB_allocImBuf(m_size[0], m_size[1], 0, 0); } if (!img->m_imbuf) { // allocate most basic imbuf, we will assign the rect buffer on the fly - img->m_imbuf = IMB_allocImBuf(img->m_size[0], img->m_size[1], 0, 0, 0); + img->m_imbuf = IMB_allocImBuf(img->m_size[0], img->m_size[1], 0, 0); } // assign temporarily our buffer to the ImBuf buffer, we use the same format img->m_imbuf->rect = img->m_image; |