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>2013-06-13 14:25:41 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2013-06-13 14:25:41 +0400
commit54a42a42549bb004656dddf99a76835b79d94d7e (patch)
treead7a097fd0da27351addf2a77867d2b2fffeba91 /source/blender/compositor/operations/COM_MovieClipOperation.cpp
parent85823bff0785ff785503ac2e488ef7a96bd537a2 (diff)
Fix crash in movie clip node when ibuf fails to load.
Was a stupid mistake in another fix here :(
Diffstat (limited to 'source/blender/compositor/operations/COM_MovieClipOperation.cpp')
-rw-r--r--source/blender/compositor/operations/COM_MovieClipOperation.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/compositor/operations/COM_MovieClipOperation.cpp b/source/blender/compositor/operations/COM_MovieClipOperation.cpp
index 7b5c2e823ac..76dc093035c 100644
--- a/source/blender/compositor/operations/COM_MovieClipOperation.cpp
+++ b/source/blender/compositor/operations/COM_MovieClipOperation.cpp
@@ -93,7 +93,7 @@ void MovieClipBaseOperation::executePixel(float output[4], float x, float y, Pix
if (ibuf == NULL || x < 0 || y < 0 || x >= this->getWidth() || y >= this->getHeight() ) {
zero_v4(output);
}
- if (ibuf->rect == NULL && ibuf->rect_float == NULL) {
+ else if (ibuf->rect == NULL && ibuf->rect_float == NULL) {
/* Happens for multilayer exr, i.e. */
zero_v4(output);
}