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:
authorJeroen Bakker <j.bakker@atmind.nl>2012-10-24 17:43:32 +0400
committerJeroen Bakker <j.bakker@atmind.nl>2012-10-24 17:43:32 +0400
commita49b1d7b5eaa02ea3caf90c9060e1326dec5f2e5 (patch)
treee4e2a414f8945678bd7d9be5743ff63b6520fbe2 /source/blender/compositor/intern
parentf746f3ea0917033ee05c0282d177a466948927a6 (diff)
Oeps... Enabled the pixelate node added documentation, removed unneeded
code
Diffstat (limited to 'source/blender/compositor/intern')
-rw-r--r--source/blender/compositor/intern/COM_Converter.cpp4
-rw-r--r--source/blender/compositor/intern/COM_InputSocket.h6
2 files changed, 4 insertions, 6 deletions
diff --git a/source/blender/compositor/intern/COM_Converter.cpp b/source/blender/compositor/intern/COM_Converter.cpp
index 71067ac8f15..2b09c9d5b8c 100644
--- a/source/blender/compositor/intern/COM_Converter.cpp
+++ b/source/blender/compositor/intern/COM_Converter.cpp
@@ -119,6 +119,7 @@
#include "COM_ViewLevelsNode.h"
#include "COM_ViewerNode.h"
#include "COM_ZCombineNode.h"
+#include "COM_PixelateNode.h"
Node *Converter::convert(bNode *b_node, bool fast)
{
@@ -390,6 +391,9 @@ Node *Converter::convert(bNode *b_node, bool fast)
node = new TrackPositionNode(b_node);
break;
/* not inplemented yet */
+ case CMP_NODE_PIXELATE:
+ node = new PixelateNode(b_node);
+ break;
default:
node = new MuteNode(b_node);
break;
diff --git a/source/blender/compositor/intern/COM_InputSocket.h b/source/blender/compositor/intern/COM_InputSocket.h
index 555de23c056..5970c9d5dd6 100644
--- a/source/blender/compositor/intern/COM_InputSocket.h
+++ b/source/blender/compositor/intern/COM_InputSocket.h
@@ -92,12 +92,6 @@ public:
void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]);
/**
- * @brief Notifies the Input of the data type (via a SocketConnection)
- * @param datatype the datatype to evaluate
- */
- void notifyActualInputType(DataType datatype);
-
- /**
* @brief move all connections of this input socket to another socket
* only use this method when already checked the availability of a SocketConnection
* @param relinkToSocket the socket to move to connections to