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:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2012-12-28 18:46:32 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2012-12-28 18:46:32 +0400
commitc2dfcd9208a6afe03b108e682cc4d47fadb5f2bf (patch)
tree1136d1145442657e6daef9e34b3e998e5b3648eb /source/blender/compositor/nodes/COM_ConvertAlphaNode.cpp
parente9ba345c46c93a193193f01d4bfac714a666d384 (diff)
Convert alpha node: rename "key alpha" to "straight alpha" for consistency.
Diffstat (limited to 'source/blender/compositor/nodes/COM_ConvertAlphaNode.cpp')
-rw-r--r--source/blender/compositor/nodes/COM_ConvertAlphaNode.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/compositor/nodes/COM_ConvertAlphaNode.cpp b/source/blender/compositor/nodes/COM_ConvertAlphaNode.cpp
index 254dfb7b9c7..a7149cc63b2 100644
--- a/source/blender/compositor/nodes/COM_ConvertAlphaNode.cpp
+++ b/source/blender/compositor/nodes/COM_ConvertAlphaNode.cpp
@@ -20,8 +20,8 @@
*/
#include "COM_ConvertAlphaNode.h"
-#include "COM_ConvertPremulToKeyOperation.h"
-#include "COM_ConvertKeyToPremulOperation.h"
+#include "COM_ConvertPremulToStraightOperation.h"
+#include "COM_ConvertStraightToPremulOperation.h"
#include "COM_ExecutionSystem.h"
void ConvertAlphaNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
@@ -31,10 +31,10 @@ void ConvertAlphaNode::convertToOperations(ExecutionSystem *graph, CompositorCon
/* value hardcoded in rna_nodetree.c */
if (node->custom1 == 1) {
- operation = new ConvertPremulToKeyOperation();
+ operation = new ConvertPremulToStraightOperation();
}
else {
- operation = new ConvertKeyToPremulOperation();
+ operation = new ConvertStraightToPremulOperation();
}
this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph);