Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2012-05-27 18:30:45 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2012-05-27 18:30:45 +0400
commit8c51ecaf9051f4b64d60eaa13371a308846d4941 (patch)
tree6026fc3908417061820baa705fc613d11e400771 /source/blender/compositor
parent2a7b4adedc1730456d83bf8da96e97e288e2cb58 (diff)
Use BKE_movieclip_get_size rather than BKE_movieclip_get_ibuf and use ibuf's resolution in tile's Movie Clip node
Diffstat (limited to 'source/blender/compositor')
-rw-r--r--source/blender/compositor/operations/COM_MovieClipOperation.cpp13
1 files changed, 5 insertions, 8 deletions
diff --git a/source/blender/compositor/operations/COM_MovieClipOperation.cpp b/source/blender/compositor/operations/COM_MovieClipOperation.cpp
index b565e48345c..6019ab879be 100644
--- a/source/blender/compositor/operations/COM_MovieClipOperation.cpp
+++ b/source/blender/compositor/operations/COM_MovieClipOperation.cpp
@@ -70,19 +70,16 @@ void MovieClipOperation::deinitExecution()
void MovieClipOperation::determineResolution(unsigned int resolution[], unsigned int preferredResolution[])
{
- ImBuf *ibuf;
-
resolution[0] = 0;
resolution[1] = 0;
if (this->movieClip) {
- ibuf = BKE_movieclip_get_ibuf(this->movieClip, this->movieClipUser);
- if (ibuf) {
- resolution[0] = ibuf->x;
- resolution[1] = ibuf->y;
+ int width, height;
- IMB_freeImBuf(ibuf);
- }
+ BKE_movieclip_get_size(this->movieClip, this->movieClipUser, &width, &height);
+
+ resolution[0] = width;
+ resolution[1] = height;
}
}