Commit: c4b3b60aad315b5060229429cef6ff3bffa0f33c
Author: Sergey Sharybin
Date: Thu Mar 12 17:13:38 2015 +0500
Branches: master
https://developer.blender.org/rBc4b3b60aad315b5060229429cef6ff3bffa0f33c
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.
===================================================================
M source/blender/compositor/operations/COM_MovieClipOperation.cpp
===================================================================
diff --git a/source/blender/compositor/operations/COM_MovieClipOperation.cpp
b/source/blender/compositor/operations/COM_MovieClipOperation.cpp
index 9a184ae..133b6d5 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];
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
