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>2015-03-12 15:13:38 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-03-12 16:24:53 +0300
commitc4b3b60aad315b5060229429cef6ff3bffa0f33c (patch)
treebc46b808a610f3a08fe109cb6141dae9c15c7092 /source/blender
parent13d443496c303c268fe14a4770696b5b68af61eb (diff)
Fix T43974: Alpha output of movie clip node crashes blender
Issue was caused by a bug in the memory optimization commit, should be backported to the final release branch.
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/compositor/operations/COM_MovieClipOperation.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/source/blender/compositor/operations/COM_MovieClipOperation.cpp b/source/blender/compositor/operations/COM_MovieClipOperation.cpp
index 9a184ae1216..133b6d520eb 100644
--- a/source/blender/compositor/operations/COM_MovieClipOperation.cpp
+++ b/source/blender/compositor/operations/COM_MovieClipOperation.cpp
@@ -124,9 +124,7 @@ MovieClipAlphaOperation::MovieClipAlphaOperation() : MovieClipBaseOperation()
void MovieClipAlphaOperation::executePixelSampled(float output[4], float x, float y, PixelSampler sampler)
{
- MovieClipBaseOperation::executePixelSampled(output, x, y, sampler);
- output[0] = output[3];
- output[1] = 0.0f;
- output[2] = 0.0f;
- output[3] = 0.0f;
+ float result[4];
+ MovieClipBaseOperation::executePixelSampled(result, x, y, sampler);
+ output[0] = result[3];
}