kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

BGE VideoTexture: refresh() on ImageFFmpeg should have no effect.

Browse Source 
ImageFFmpeg objects will not refresh properly because the image
file is closed immediately after creation. Therefore refresh()
should have no effect on them.
This was causing problems with ImageMix using ImageFFmpeg as
sources: refreshing the ImageMix object is required to update
the mix but it has the side effect of refreshing the underlying
sources, hence the need to skip refresh on fixed images.
This commit is contained in:
Benoit Bolsee 2014-12-04 23:49:15 +01:00
parent 226eb53bc7
commit cf7bdb42ac
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/gameengine/VideoTexture/VideoFFmpeg.cpp
View File

@ -86,6 +86,13 @@ VideoFFmpeg::~VideoFFmpeg ()
{
}
void VideoFFmpeg::refresh(void)
{
// a fixed image will not refresh because it is loaded only once at creation
if (m_isImage)
return;
m_avail = false;
}
// release components
bool VideoFFmpeg::release()

3
source/gameengine/VideoTexture/VideoFFmpeg.h
View File

@ -85,7 +85,8 @@ public:
/// release video source
virtual bool release (void);
/// overwrite base refresh to handle fixed image
virtual void refresh(void);
/// play video
virtual bool play (void);
/// pause video