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:
authorCampbell Barton <ideasman42@gmail.com>2019-05-01 03:50:02 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-05-01 03:51:13 +0300
commitc7041403d0e52a1ddffefb1db5713dbb8e6908c7 (patch)
tree3eccb37efa2c624af31b5f067e3d3b5242fc0eb4 /source/blender/compositor
parent63f0e150edaeea26fbcc48f62597f4f5c71cc64a (diff)
Cleanup: comments (long lines) in compositor
Diffstat (limited to 'source/blender/compositor')
-rw-r--r--source/blender/compositor/COM_defines.h6
-rw-r--r--source/blender/compositor/intern/COM_CPUDevice.h3
-rw-r--r--source/blender/compositor/intern/COM_CompositorContext.h4
-rw-r--r--source/blender/compositor/intern/COM_Converter.h6
-rw-r--r--source/blender/compositor/intern/COM_Debug.cpp8
-rw-r--r--source/blender/compositor/intern/COM_ExecutionGroup.cpp6
-rw-r--r--source/blender/compositor/intern/COM_ExecutionGroup.h23
-rw-r--r--source/blender/compositor/intern/COM_ExecutionSystem.h55
-rw-r--r--source/blender/compositor/intern/COM_MemoryBuffer.h3
-rw-r--r--source/blender/compositor/intern/COM_Node.h3
-rw-r--r--source/blender/compositor/intern/COM_NodeGraph.cpp3
-rw-r--r--source/blender/compositor/intern/COM_NodeOperation.h30
-rw-r--r--source/blender/compositor/intern/COM_NodeOperationBuilder.cpp2
-rw-r--r--source/blender/compositor/intern/COM_WorkScheduler.cpp3
-rw-r--r--source/blender/compositor/intern/COM_WorkScheduler.h7
-rw-r--r--source/blender/compositor/nodes/COM_DilateErodeNode.cpp6
-rw-r--r--source/blender/compositor/nodes/COM_FlipNode.cpp3
-rw-r--r--source/blender/compositor/operations/COM_BilateralBlurOperation.cpp3
-rw-r--r--source/blender/compositor/operations/COM_BokehImageOperation.h29
-rw-r--r--source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h3
-rw-r--r--source/blender/compositor/operations/COM_ColorBalanceLGGOperation.cpp3
-rw-r--r--source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp3
-rw-r--r--source/blender/compositor/operations/COM_DespeckleOperation.cpp4
-rw-r--r--source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp21
-rw-r--r--source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp3
-rw-r--r--source/blender/compositor/operations/COM_GlareFogGlowOperation.cpp4
-rw-r--r--source/blender/compositor/operations/COM_MapRangeOperation.cpp3
-rw-r--r--source/blender/compositor/operations/COM_NormalizeOperation.cpp3
-rw-r--r--source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp4
-rw-r--r--source/blender/compositor/operations/COM_PlaneCornerPinOperation.cpp5
-rw-r--r--source/blender/compositor/operations/COM_ScaleOperation.cpp4
-rw-r--r--source/blender/compositor/operations/COM_SunBeamsOperation.cpp11
-rw-r--r--source/blender/compositor/operations/COM_TextureOperation.cpp4
-rw-r--r--source/blender/compositor/operations/COM_VectorBlurOperation.cpp5
-rw-r--r--source/blender/compositor/operations/COM_WrapOperation.cpp2
-rw-r--r--source/blender/compositor/operations/COM_ZCombineOperation.cpp2
36 files changed, 174 insertions, 113 deletions
diff --git a/source/blender/compositor/COM_defines.h b/source/blender/compositor/COM_defines.h
index de731b8e0da..7a38ad721bc 100644
--- a/source/blender/compositor/COM_defines.h
+++ b/source/blender/compositor/COM_defines.h
@@ -68,12 +68,14 @@ typedef enum CompositorPriority {
// workscheduler threading models
/**
- * COM_TM_QUEUE is a multithreaded model, which uses the BLI_thread_queue pattern. This is the default option.
+ * COM_TM_QUEUE is a multithreaded model, which uses the BLI_thread_queue pattern.
+ * This is the default option.
*/
#define COM_TM_QUEUE 1
/**
- * COM_TM_NOTHREAD is a single threading model, everything is executed in the caller thread. easy for debugging
+ * COM_TM_NOTHREAD is a single threading model, everything is executed in the caller thread.
+ * easy for debugging
*/
#define COM_TM_NOTHREAD 0
diff --git a/source/blender/compositor/intern/COM_CPUDevice.h b/source/blender/compositor/intern/COM_CPUDevice.h
index d82046a729f..1d411569146 100644
--- a/source/blender/compositor/intern/COM_CPUDevice.h
+++ b/source/blender/compositor/intern/COM_CPUDevice.h
@@ -23,7 +23,8 @@
/**
* \brief class representing a CPU device.
- * \note for every hardware thread in the system a CPUDevice instance will exist in the workscheduler
+ * \note for every hardware thread in the system a CPUDevice instance
+ * will exist in the workscheduler.
*/
class CPUDevice : public Device {
public:
diff --git a/source/blender/compositor/intern/COM_CompositorContext.h b/source/blender/compositor/intern/COM_CompositorContext.h
index 466779ec9bd..f4cd60e3ee0 100644
--- a/source/blender/compositor/intern/COM_CompositorContext.h
+++ b/source/blender/compositor/intern/COM_CompositorContext.h
@@ -33,8 +33,8 @@
class CompositorContext {
private:
/**
- * \brief The rendering field describes if we are rendering (F12) or if we are editing (Node editor)
- * This field is initialized in ExecutionSystem and must only be read from that point on.
+ * \brief The rendering field describes if we are rendering (F12) or if we are editing (Node
+ * editor) This field is initialized in ExecutionSystem and must only be read from that point on.
* \see ExecutionSystem
*/
bool m_rendering;
diff --git a/source/blender/compositor/intern/COM_Converter.h b/source/blender/compositor/intern/COM_Converter.h
index 0d7fc40de17..1213246b9c9 100644
--- a/source/blender/compositor/intern/COM_Converter.h
+++ b/source/blender/compositor/intern/COM_Converter.h
@@ -41,7 +41,8 @@ class Converter {
*
* For all nodetypes a wrapper class is created.
*
- * \note When adding a new node to blender, this method needs to be changed to return the correct Node instance.
+ * \note When adding a new node to blender, this method needs to be changed to return the correct
+ * Node instance.
*
* \see Node
*/
@@ -55,7 +56,8 @@ class Converter {
static bool is_fast_node(bNode *b_node);
/**
- * \brief This method will add a datetype conversion rule when the to-socket does not support the from-socket actual data type.
+ * \brief This method will add a datetype conversion rule when the to-socket does not support the
+ * from-socket actual data type.
*
* \note this method is called when conversion is needed.
*
diff --git a/source/blender/compositor/intern/COM_Debug.cpp b/source/blender/compositor/intern/COM_Debug.cpp
index 8632b7ad0f0..72c1e0cf316 100644
--- a/source/blender/compositor/intern/COM_Debug.cpp
+++ b/source/blender/compositor/intern/COM_Debug.cpp
@@ -367,8 +367,12 @@ bool DebugInfo::graphviz_system(const ExecutionSystem *system, char *str, int ma
system, operation, group, str + len, maxlen > len ? maxlen - len : 0);
}
- // len += snprintf(str+len, maxlen>len ? maxlen-len : 0, "// OUTPUTOPERATION: %p\r\n", group->getOutputOperation());
- // len += snprintf(str+len, maxlen>len ? maxlen-len : 0, " O_%p\r\n", group->getOutputOperation());
+ // len += snprintf(str+len,
+ // maxlen>len ? maxlen-len : 0,
+ // "// OUTPUTOPERATION: %p\r\n", group->getOutputOperation());
+ // len += snprintf(
+ // str+len, maxlen>len ? maxlen-len : 0,
+ // " O_%p\r\n", group->getOutputOperation());
len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "}\r\n");
}
diff --git a/source/blender/compositor/intern/COM_ExecutionGroup.cpp b/source/blender/compositor/intern/COM_ExecutionGroup.cpp
index 367362c2c66..1718722e860 100644
--- a/source/blender/compositor/intern/COM_ExecutionGroup.cpp
+++ b/source/blender/compositor/intern/COM_ExecutionGroup.cpp
@@ -86,7 +86,8 @@ bool ExecutionGroup::canContainOperation(NodeOperation *operation)
if (m_complex) {
return false;
}
- /* complex ops can't be added to other groups (except their own, which they initialize, see above) */
+ /* complex ops can't be added to other groups (except their own, which they initialize, see
+ * above) */
if (operation->isComplex()) {
return false;
}
@@ -188,7 +189,8 @@ void ExecutionGroup::determineNumberOfChunks()
}
/**
- * this method is called for the top execution groups. containing the compositor node or the preview node or the viewer node)
+ * this method is called for the top execution groups. containing the compositor node or the
+ * preview node or the viewer node)
*/
void ExecutionGroup::execute(ExecutionSystem *graph)
{
diff --git a/source/blender/compositor/intern/COM_ExecutionGroup.h b/source/blender/compositor/intern/COM_ExecutionGroup.h
index ff9ac5d0582..41ae6f1c5b2 100644
--- a/source/blender/compositor/intern/COM_ExecutionGroup.h
+++ b/source/blender/compositor/intern/COM_ExecutionGroup.h
@@ -55,7 +55,8 @@ typedef enum ChunkExecutionState {
/**
* \brief Class ExecutionGroup is a group of Operations that are executed as one.
- * This grouping is used to combine Operations that can be executed as one whole when multi-processing.
+ * This grouping is used to combine Operations that can be executed as one whole when
+ * multi-processing.
* \ingroup Execution
*/
class ExecutionGroup {
@@ -72,7 +73,8 @@ class ExecutionGroup {
/**
* \brief is this ExecutionGroup an input ExecutionGroup
- * an input execution group is a group that is at the end of the calculation (the output is important for the user)
+ * an input execution group is a group that is at the end of the calculation
+ * (the output is important for the user).
*/
int m_isOutput;
@@ -134,8 +136,9 @@ class ExecutionGroup {
Operations m_cachedReadOperations;
/**
- * \brief reference to the original bNodeTree, this field is only set for the 'top' execution group.
- * \note can only be used to call the callbacks for progress, status and break
+ * \brief reference to the original bNodeTree,
+ * this field is only set for the 'top' execution group.
+ * \note can only be used to call the callbacks for progress, status and break.
*/
const bNodeTree *m_bTree;
@@ -154,7 +157,8 @@ class ExecutionGroup {
/**
* \brief indicator when this ExecutionGroup has valid Operations in its vector for Execution
- * \note When building the ExecutionGroup Operations are added via recursion. First a WriteBufferOperations is added, then the
+ * \note When building the ExecutionGroup Operations are added via recursion.
+ * First a WriteBufferOperations is added, then the.
* \note Operation containing the settings that is important for the ExecutiongGroup is added,
* \note When this occurs, these settings are copied over from the node to the ExecutionGroup
* \note and the Initialized flag is set to true.
@@ -204,7 +208,8 @@ class ExecutionGroup {
/**
* \brief try to schedule a specific chunk.
- * \note scheduling succeeds when all input requirements are met and the chunks hasn't been scheduled yet.
+ * \note scheduling succeeds when all input requirements are met and the chunks hasn't been
+ * scheduled yet.
* \param graph:
* \param xChunk:
* \param yChunk:
@@ -375,9 +380,11 @@ class ExecutionGroup {
/**
* \brief schedule an ExecutionGroup
- * \note this method will return when all chunks have been calculated, or the execution has breaked (by user)
+ * \note this method will return when all chunks have been calculated, or the execution has
+ * breaked (by user)
*
- * first the order of the chunks will be determined. This is determined by finding the ViewerOperation and get the relevant information from it.
+ * first the order of the chunks will be determined. This is determined by finding the
+ * ViewerOperation and get the relevant information from it.
* - ChunkOrdering
* - CenterX
* - CenterY
diff --git a/source/blender/compositor/intern/COM_ExecutionSystem.h b/source/blender/compositor/intern/COM_ExecutionSystem.h
index 55c2ed6c22b..009b1fb28cd 100644
--- a/source/blender/compositor/intern/COM_ExecutionSystem.h
+++ b/source/blender/compositor/intern/COM_ExecutionSystem.h
@@ -30,12 +30,13 @@ class ExecutionGroup;
/**
* \page execution Execution model
- * In order to get to an efficient model for execution, several steps are being done. these steps are explained below.
+ * In order to get to an efficient model for execution, several steps are being done. these steps
+ * are explained below.
*
* \section EM_Step1 Step 1: translating blender node system to the new compsitor system
- * Blenders node structure is based on C structs (DNA). These structs are not efficient in the new architecture.
- * We want to use classes in order to simplify the system.
- * during this step the blender node_tree is evaluated and converted to a CPP node system.
+ * Blenders node structure is based on C structs (DNA). These structs are not efficient in the new
+ * architecture. We want to use classes in order to simplify the system. during this step the
+ * blender node_tree is evaluated and converted to a CPP node system.
*
* \see ExecutionSystem
* \see Converter.convert
@@ -43,35 +44,41 @@ class ExecutionGroup;
*
* \section EM_Step2 Step2: translating nodes to operations
* Ungrouping the GroupNodes. Group nodes are node_tree's in node_tree's.
- * The new system only supports a single level of node_tree. We will 'flatten' the system in a single level.
+ * The new system only supports a single level of node_tree.
+ * We will 'flatten' the system in a single level.
* \see GroupNode
* \see ExecutionSystemHelper.ungroup
*
- * Every node has the ability to convert itself to operations. The node itself is responsible to create a correct
- * NodeOperation setup based on its internal settings.
- * Most Node only need to convert it to its NodeOperation. Like a ColorToBWNode doesn't check anything,
- * but replaces itself with a ConvertColorToBWOperation.
- * More complex nodes can use different NodeOperation based on settings; like MixNode.
- * based on the selected Mixtype a different operation will be used.
- * for more information see the page about creating new Nodes. [@subpage newnode]
+ * Every node has the ability to convert itself to operations. The node itself is responsible to
+ * create a correct NodeOperation setup based on its internal settings. Most Node only need to
+ * convert it to its NodeOperation. Like a ColorToBWNode doesn't check anything, but replaces
+ * itself with a ConvertColorToBWOperation. More complex nodes can use different NodeOperation
+ * based on settings; like MixNode. based on the selected Mixtype a different operation will be
+ * used. for more information see the page about creating new Nodes. [@subpage newnode]
*
* \see ExecutionSystem.convertToOperations
* \see Node.convertToOperations
* \see NodeOperation base class for all operations in the system
*
* \section EM_Step3 Step3: add additional conversions to the operation system
- * - Data type conversions: the system has 3 data types COM_DT_VALUE, COM_DT_VECTOR, COM_DT_COLOR.
- * The user can connect a Value socket to a color socket.
- * As values are ordered differently than colors a conversion happens.
+ * - Data type conversions: the system has 3 data types COM_DT_VALUE, COM_DT_VECTOR,
+ * COM_DT_COLOR. The user can connect a Value socket to a color socket. As values are ordered
+ * differently than colors a conversion happens.
*
* - Image size conversions: the system can automatically convert when resolutions do not match.
* An NodeInput has a resize mode. This can be any of the following settings.
- * - [@ref InputSocketResizeMode.COM_SC_CENTER]: The center of both images are aligned
- * - [@ref InputSocketResizeMode.COM_SC_FIT_WIDTH]: The width of both images are aligned
- * - [@ref InputSocketResizeMode.COM_SC_FIT_HEIGHT]: the height of both images are aligned
- * - [@ref InputSocketResizeMode.COM_SC_FIT]: The width, or the height of both images are aligned to make sure that it fits.
- * - [@ref InputSocketResizeMode.COM_SC_STRETCH]: The width and the height of both images are aligned
- * - [@ref InputSocketResizeMode.COM_SC_NO_RESIZE]: bottom left of the images are aligned.
+ * - [@ref InputSocketResizeMode.COM_SC_CENTER]:
+ * The center of both images are aligned
+ * - [@ref InputSocketResizeMode.COM_SC_FIT_WIDTH]:
+ * The width of both images are aligned
+ * - [@ref InputSocketResizeMode.COM_SC_FIT_HEIGHT]:
+ * The height of both images are aligned
+ * - [@ref InputSocketResizeMode.COM_SC_FIT]:
+ * The width, or the height of both images are aligned to make sure that it fits.
+ * - [@ref InputSocketResizeMode.COM_SC_STRETCH]:
+ * The width and the height of both images are aligned.
+ * - [@ref InputSocketResizeMode.COM_SC_NO_RESIZE]:
+ * Bottom left of the images are aligned.
*
* \see Converter.convertDataType Datatype conversions
* \see Converter.convertResolution Image size conversions
@@ -79,8 +86,8 @@ class ExecutionGroup;
* \section EM_Step4 Step4: group operations in executions groups
* ExecutionGroup are groups of operations that are calculated as being one bigger operation.
* All operations will be part of an ExecutionGroup.
- * Complex nodes will be added to separate groups. Between ExecutionGroup's the data will be stored in MemoryBuffers.
- * ReadBufferOperations and WriteBufferOperations are added where needed.
+ * Complex nodes will be added to separate groups. Between ExecutionGroup's the data will be stored
+ * in MemoryBuffers. ReadBufferOperations and WriteBufferOperations are added where needed.
*
* <pre>
*
@@ -127,7 +134,7 @@ class ExecutionSystem {
*/
Groups m_groups;
- private: //methods
+ private: // methods
/**
* find all execution group with output nodes
*/
diff --git a/source/blender/compositor/intern/COM_MemoryBuffer.h b/source/blender/compositor/intern/COM_MemoryBuffer.h
index 01a8a86bb15..df936818f33 100644
--- a/source/blender/compositor/intern/COM_MemoryBuffer.h
+++ b/source/blender/compositor/intern/COM_MemoryBuffer.h
@@ -35,7 +35,8 @@ extern "C" {
* \ingroup Memory
*/
typedef enum MemoryBufferState {
- /** \brief memory has been allocated on creator device and CPU machine, but kernel has not been executed */
+ /** \brief memory has been allocated on creator device and CPU machine,
+ * but kernel has not been executed */
COM_MB_ALLOCATED = 1,
/** \brief memory is available for use, content has been created */
COM_MB_AVAILABLE = 2,
diff --git a/source/blender/compositor/intern/COM_Node.h b/source/blender/compositor/intern/COM_Node.h
index 9bacf271283..c26f6cdfb8b 100644
--- a/source/blender/compositor/intern/COM_Node.h
+++ b/source/blender/compositor/intern/COM_Node.h
@@ -112,7 +112,8 @@ class Node {
/**
* \brief set the reference to the bNode
- * \note used in Node instances to receive the storage/settings and complex node for highlight during execution
+ * \note used in Node instances to receive the storage/settings and complex
+ * node for highlight during execution.
* \param bNode:
*/
void setbNode(bNode *node)
diff --git a/source/blender/compositor/intern/COM_NodeGraph.cpp b/source/blender/compositor/intern/COM_NodeGraph.cpp
index 39dc946f3bc..4104886bc1b 100644
--- a/source/blender/compositor/intern/COM_NodeGraph.cpp
+++ b/source/blender/compositor/intern/COM_NodeGraph.cpp
@@ -303,7 +303,8 @@ void NodeGraph::add_proxies_group(const CompositorContext &context,
/* missing node group datablock can happen with library linking */
if (!b_group_tree) {
- /* this error case its handled in convertToOperations() so we don't get un-convertred sockets */
+ /* This error case its handled in convertToOperations()
+ * so we don't get un-convertred sockets. */
return;
}
diff --git a/source/blender/compositor/intern/COM_NodeOperation.h b/source/blender/compositor/intern/COM_NodeOperation.h
index 968dc171bd3..af9ed2648c9 100644
--- a/source/blender/compositor/intern/COM_NodeOperation.h
+++ b/source/blender/compositor/intern/COM_NodeOperation.h
@@ -53,17 +53,21 @@ class NodeOperationOutput;
* \ingroup Model
*/
typedef enum InputResizeMode {
- /** \brief Center the input image to the center of the working area of the node, no resizing occurs */
+ /** \brief Center the input image to the center of the working area of the node, no resizing
+ occurs */
COM_SC_CENTER = NS_CR_CENTER,
- /** \brief The bottom left of the input image is the bottom left of the working area of the node, no resizing occurs */
+ /** \brief The bottom left of the input image is the bottom left of the working area of the node,
+ no resizing occurs */
COM_SC_NO_RESIZE = NS_CR_NONE,
/** \brief Fit the width of the input image to the width of the working area of the node */
COM_SC_FIT_WIDTH = NS_CR_FIT_WIDTH,
/** \brief Fit the height of the input image to the height of the working area of the node */
COM_SC_FIT_HEIGHT = NS_CR_FIT_HEIGHT,
- /** \brief Fit the width or the height of the input image to the width or height of the working area of the node, image will be larger than the working area */
+ /** \brief Fit the width or the height of the input image to the width or height of the working
+ area of the node, image will be larger than the working area */
COM_SC_FIT = NS_CR_FIT,
- /** \brief Fit the width and the height of the input image to the width and height of the working area of the node, image will be equally larger than the working area */
+ /** \brief Fit the width and the height of the input image to the width and height of the working
+ area of the node, image will be equally larger than the working area */
COM_SC_STRETCH = NS_CR_STRETCH,
} InputResizeMode;
@@ -158,9 +162,11 @@ class NodeOperation : public SocketReader {
unsigned int preferredResolution[2]);
/**
- * \brief isOutputOperation determines whether this operation is an output of the ExecutionSystem during rendering or editing.
+ * \brief isOutputOperation determines whether this operation is an output of the ExecutionSystem
+ * during rendering or editing.
*
- * Default behavior if not overridden, this operation will not be evaluated as being an output of the ExecutionSystem.
+ * Default behavior if not overridden, this operation will not be evaluated as being an output of
+ * the ExecutionSystem.
*
* \see ExecutionSystem
* \group check
@@ -218,7 +224,8 @@ class NodeOperation : public SocketReader {
}
/**
- * \brief custom handle to add new tasks to the OpenCL command queue in order to execute a chunk on an GPUDevice
+ * \brief custom handle to add new tasks to the OpenCL command queue
+ * in order to execute a chunk on an GPUDevice.
* \ingroup execution
* \param context: the OpenCL context
* \param program: the OpenCL program containing all compositor kernels
@@ -226,8 +233,10 @@ class NodeOperation : public SocketReader {
* \param outputMemoryBuffer: the allocated memory buffer in main CPU memory
* \param clOutputBuffer: the allocated memory buffer in OpenCLDevice memory
* \param inputMemoryBuffers: all input MemoryBuffer's needed
- * \param clMemToCleanUp: all created cl_mem references must be added to this list. Framework will clean this after execution
- * \param clKernelsToCleanUp: all created cl_kernel references must be added to this list. Framework will clean this after execution
+ * \param clMemToCleanUp: all created cl_mem references must be added to this list.
+ * Framework will clean this after execution
+ * \param clKernelsToCleanUp: all created cl_kernel references must be added to this list.
+ * Framework will clean this after execution
*/
virtual void executeOpenCL(OpenCLDevice * /*device*/,
MemoryBuffer * /*outputMemoryBuffer*/,
@@ -297,7 +306,8 @@ class NodeOperation : public SocketReader {
/**
* \brief is this operation the active viewer output
- * user can select an ViewerNode to be active (the result of this node will be drawn on the backdrop)
+ * user can select an ViewerNode to be active
+ * (the result of this node will be drawn on the backdrop).
* \return [true:false]
* \see BaseViewerOperation
*/
diff --git a/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp b/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp
index 853e0e768d3..2b17fc0e5f7 100644
--- a/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp
+++ b/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp
@@ -84,7 +84,7 @@ void NodeOperationBuilder::convertToOperations(ExecutionSystem *system)
const OpInputs &op_to_list = find_operation_inputs(inverse_input_map, to);
if (!op_from || op_to_list.empty()) {
/* XXX allow this? error/debug message? */
- //BLI_assert(false);
+ // BLI_assert(false);
/* XXX note: this can happen with certain nodes (e.g. OutputFile)
* which only generate operations in certain circumstances (rendering)
* just let this pass silently for now ...
diff --git a/source/blender/compositor/intern/COM_WorkScheduler.cpp b/source/blender/compositor/intern/COM_WorkScheduler.cpp
index c3d1e0cf511..48af823f8f5 100644
--- a/source/blender/compositor/intern/COM_WorkScheduler.cpp
+++ b/source/blender/compositor/intern/COM_WorkScheduler.cpp
@@ -58,7 +58,8 @@ static ThreadQueue *g_gpuqueue;
# ifdef COM_OPENCL_ENABLED
static cl_context g_context;
static cl_program g_program;
-/// \brief list of all OpenCLDevices. for every OpenCL GPU device an instance of OpenCLDevice is created
+/// \brief list of all OpenCLDevices. for every OpenCL GPU device an instance of OpenCLDevice is
+/// created
static vector<OpenCLDevice *> g_gpudevices;
/// \brief list of all thread for every GPUDevice in cpudevices a thread exists
static ListBase g_gputhreads;
diff --git a/source/blender/compositor/intern/COM_WorkScheduler.h b/source/blender/compositor/intern/COM_WorkScheduler.h
index 2b523272123..390fde82b61 100644
--- a/source/blender/compositor/intern/COM_WorkScheduler.h
+++ b/source/blender/compositor/intern/COM_WorkScheduler.h
@@ -67,9 +67,10 @@ class WorkScheduler {
*
* during initialization the mutexes are initialized.
* there are two mutexes (for every device type one)
- * After mutex initialization the system is queried in order to count the number of CPUDevices and GPUDevices to be created.
- * For every hardware thread a CPUDevice and for every OpenCL GPU device a OpenCLDevice is created.
- * these devices are stored in a separate list (cpudevices & gpudevices)
+ * After mutex initialization the system is queried in order to count the number of CPUDevices
+ * and GPUDevices to be created. For every hardware thread a CPUDevice and for every OpenCL GPU
+ * device a OpenCLDevice is created. these devices are stored in a separate list (cpudevices &
+ * gpudevices)
*
* This function can be called multiple times to lazily initialize OpenCL.
*/
diff --git a/source/blender/compositor/nodes/COM_DilateErodeNode.cpp b/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
index cde94b23ed8..50fbe983c91 100644
--- a/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
+++ b/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
@@ -92,7 +92,8 @@ void DilateErodeNode::convertToOperations(NodeConverter &converter,
converter.addOperation(operationx);
converter.mapInputSocket(getInputSocket(0), operationx->getInputSocket(0));
- // converter.mapInputSocket(getInputSocket(1), operationx->getInputSocket(1)); // no size input yet
+ // converter.mapInputSocket(getInputSocket(1), operationx->getInputSocket(1)); // no size input
+ // yet
GaussianAlphaYBlurOperation *operationy = new GaussianAlphaYBlurOperation();
operationy->setData(&m_alpha_blur);
@@ -101,7 +102,8 @@ void DilateErodeNode::convertToOperations(NodeConverter &converter,
converter.addOperation(operationy);
converter.addLink(operationx->getOutputSocket(), operationy->getInputSocket(0));
- // converter.mapInputSocket(getInputSocket(1), operationy->getInputSocket(1)); // no size input yet
+ // converter.mapInputSocket(getInputSocket(1), operationy->getInputSocket(1)); // no size input
+ // yet
converter.mapOutputSocket(getOutputSocket(0), operationy->getOutputSocket());
converter.addPreview(operationy->getOutputSocket());
diff --git a/source/blender/compositor/nodes/COM_FlipNode.cpp b/source/blender/compositor/nodes/COM_FlipNode.cpp
index 59b881bfcf7..4dfff9c8e49 100644
--- a/source/blender/compositor/nodes/COM_FlipNode.cpp
+++ b/source/blender/compositor/nodes/COM_FlipNode.cpp
@@ -33,7 +33,8 @@ void FlipNode::convertToOperations(NodeConverter &converter,
NodeOutput *outputSocket = this->getOutputSocket(0);
FlipOperation *operation = new FlipOperation();
switch (this->getbNode()->custom1) {
- case 0: /// \TODO: I didn't find any constants in the old implementation, should I introduce them.
+ case 0: /// \TODO: I didn't find any constants in the old implementation, should I introduce
+ /// them.
operation->setFlipX(true);
operation->setFlipY(false);
break;
diff --git a/source/blender/compositor/operations/COM_BilateralBlurOperation.cpp b/source/blender/compositor/operations/COM_BilateralBlurOperation.cpp
index 5628c575b70..44cb4056c99 100644
--- a/source/blender/compositor/operations/COM_BilateralBlurOperation.cpp
+++ b/source/blender/compositor/operations/COM_BilateralBlurOperation.cpp
@@ -44,7 +44,8 @@ void BilateralBlurOperation::initExecution()
void BilateralBlurOperation::executePixel(float output[4], int x, int y, void *data)
{
- // read the determinator color at x, y, this will be used as the reference color for the determinator
+ // read the determinator color at x, y, this will be used as the reference color for the
+ // determinator
float determinatorReferenceColor[4];
float determinator[4];
float tempColor[4];
diff --git a/source/blender/compositor/operations/COM_BokehImageOperation.h b/source/blender/compositor/operations/COM_BokehImageOperation.h
index 58a1e2f85d8..2bb3e5bc1ab 100644
--- a/source/blender/compositor/operations/COM_BokehImageOperation.h
+++ b/source/blender/compositor/operations/COM_BokehImageOperation.h
@@ -21,8 +21,8 @@
#include "COM_NodeOperation.h"
/**
- * \brief The BokehImageOperation class is an operation that creates an image useful to mimic the internals
- *of a camera.
+ * \brief The BokehImageOperation class is an operation that creates an image useful to mimic the
+ *internals of a camera.
*
* features:
* - number of flaps
@@ -31,20 +31,21 @@
* - simulate catadioptric
* - simulate lensshift
*
- * Per pixel the algorithm determines the edge of the bokeh on the same line as the center of the image and the pixel
- * is evaluating.
+ * Per pixel the algorithm determines the edge of the bokeh on the same line as the center of the
+ *image and the pixel is evaluating.
*
- * The edge is detected by finding the closest point on the direct line between the two nearest flap-corners.
- * this edge is interpolated with a full circle.
- * Result of this edge detection is stored as the distance between the center of the image and the edge.
+ * The edge is detected by finding the closest point on the direct line between the two nearest
+ *flap-corners. this edge is interpolated with a full circle. Result of this edge detection is
+ *stored as the distance between the center of the image and the edge.
*
- * catadioptric lenses are simulated to interpolate between the center of the image and the distance of the edge.
- * We now have three distances:
+ * catadioptric lenses are simulated to interpolate between the center of the image and the
+ *distance of the edge. We now have three distances:
* - distance between the center of the image and the pixel to be evaluated
* - distance between the center of the image and the outer-edge
* - distance between the center of the image and the inner-edge
*
- * With a simple compare it can be detected if the evaluated pixel is between the outer and inner edge.
+ * With a simple compare it can be detected if the evaluated pixel is between the outer and inner
+ *edge.
*/
class BokehImageOperation : public NodeOperation {
private:
@@ -95,7 +96,8 @@ class BokehImageOperation : public NodeOperation {
/**
* \brief Determine if a coordinate is inside the bokeh image
*
- * \param distance: the distance that will be used. This parameter is modified a bit to mimic lens shifts
+ * \param distance: the distance that will be used.
+ * This parameter is modified a bit to mimic lens shifts.
* \param x: the x coordinate of the pixel to evaluate
* \param y: the y coordinate of the pixel to evaluate
* \return float range 0..1 0 is completely outside
@@ -121,9 +123,8 @@ class BokehImageOperation : public NodeOperation {
void deinitExecution();
/**
- * \brief determine the resolution of this operation. currently fixed at [COM_BLUR_BOKEH_PIXELS, COM_BLUR_BOKEH_PIXELS]
- * \param resolution:
- * \param preferredResolution:
+ * \brief determine the resolution of this operation. currently fixed at [COM_BLUR_BOKEH_PIXELS,
+ * COM_BLUR_BOKEH_PIXELS] \param resolution: \param preferredResolution:
*/
void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]);
diff --git a/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h b/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h
index 3f5c0896221..7fb9d839d2d 100644
--- a/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h
+++ b/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h
@@ -22,7 +22,8 @@
#include "DNA_node_types.h"
#include "COM_CalculateMeanOperation.h"
/**
- * \brief base class of CalculateStandardDeviation, implementing the simple CalculateStandardDeviation
+ * \brief base class of CalculateStandardDeviation,
+ * implementing the simple CalculateStandardDeviation.
* \ingroup operation
*/
class CalculateStandardDeviationOperation : public CalculateMeanOperation {
diff --git a/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.cpp b/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.cpp
index c48c39f7726..68b5af3089a 100644
--- a/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.cpp
+++ b/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.cpp
@@ -24,7 +24,8 @@ inline float colorbalance_lgg(float in, float lift_lgg, float gamma_inv, float g
/* 1:1 match with the sequencer with linear/srgb conversions, the conversion isnt pretty
* but best keep it this way, sice testing for durian shows a similar calculation
* without lin/srgb conversions gives bad results (over-saturated shadows) with colors
- * slightly below 1.0. some correction can be done but it ends up looking bad for shadows or lighter tones - campbell */
+ * slightly below 1.0. some correction can be done but it ends up looking bad for shadows or
+ * lighter tones - campbell */
float x = (((linearrgb_to_srgb(in) - 1.0f) * lift_lgg) + 1.0f) * gain;
/* prevent NaN */
diff --git a/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp b/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp
index c47e4d560a5..704f7cfad39 100644
--- a/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp
+++ b/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp
@@ -95,7 +95,8 @@ void ConvertDepthToRadiusOperation::executePixelSampled(float output[4],
#endif
radius = 0.5f * fabsf(this->m_aperture *
(this->m_dof_sp * (this->m_inverseFocalDistance - iZ) - 1.0f));
- // 'bug' #6615, limit minimum radius to 1 pixel, not really a solution, but somewhat mitigates the problem
+ // 'bug' #6615, limit minimum radius to 1 pixel, not really a solution, but somewhat mitigates
+ // the problem
if (radius < 0.0f) {
radius = 0.0f;
}
diff --git a/source/blender/compositor/operations/COM_DespeckleOperation.cpp b/source/blender/compositor/operations/COM_DespeckleOperation.cpp
index 807450040de..9b8d72da26d 100644
--- a/source/blender/compositor/operations/COM_DespeckleOperation.cpp
+++ b/source/blender/compositor/operations/COM_DespeckleOperation.cpp
@@ -70,7 +70,7 @@ void DespeckleOperation::executePixel(float output[4], int x, int y, void * /*da
CLAMP(y3, 0, getHeight() - 1);
float value[4];
this->m_inputValueOperation->read(value, x2, y2, NULL);
- //const float mval = 1.0f - value[0];
+ // const float mval = 1.0f - value[0];
this->m_inputOperation->read(color_org, x2, y2, NULL);
@@ -115,7 +115,7 @@ void DespeckleOperation::executePixel(float output[4], int x, int y, void * /*da
COLOR_ADD(TOT_DIV_CNR)
mul_v4_fl(color_mid, 1.0f / (4.0f + (4.0f * (float)M_SQRT1_2)));
- //mul_v4_fl(color_mid, 1.0f / w);
+ // mul_v4_fl(color_mid, 1.0f / w);
if ((w != 0.0f) && ((w / WTOT) > (this->m_threshold_neighbor)) &&
color_diff(color_mid, color_org, this->m_threshold)) {
diff --git a/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp b/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
index cd1dae2c9b5..f872388e3c7 100644
--- a/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
+++ b/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
@@ -950,12 +950,16 @@ static void do_createEdgeLocationBuffer(unsigned int t,
unsigned int rsl; // long used for finding fast 1.0/sqrt
unsigned int gradientFillOffset;
- unsigned int innerAccum =
- 0; // for looping inner edge pixel indexes, represents current position from offset
- unsigned int outerAccum =
- 0; // for looping outer edge pixel indexes, represents current position from offset
- unsigned int gradientAccum =
- 0; // for looping gradient pixel indexes, represents current position from offset
+
+ /* For looping inner edge pixel indexes, represents current position from offset. */
+ unsigned int innerAccum = 0;
+ /* For looping outer edge pixel indexes, represents current position from offset. */
+ unsigned int outerAccum = 0;
+ /* For looping gradient pixel indexes, represents current position from offset. */
+ unsigned int gradientAccum = 0;
+
+ /* */
+ /* clang-format off */
/*
* Here we compute the size of buffer needed to hold (row,col) coordinates
* for each pixel previously determined to be either gradient, inner edge,
@@ -1017,6 +1021,7 @@ static void do_createEdgeLocationBuffer(unsigned int t,
* each iteration of the final gradient calculation than it is to deconstruct
* a memory location into x,y pairs each round.
*/
+ /* clang-format on */
gradientFillOffset = 0; // since there are likely "more" of these, put it first. :)
*innerEdgeOffset = gradientFillOffset + gsz; // set start of inner edge indexes
@@ -1025,7 +1030,7 @@ static void do_createEdgeLocationBuffer(unsigned int t,
gradientAccum = gradientFillOffset; // each accumulator variable starts at its respective
innerAccum = *innerEdgeOffset; // section's offset so when we start filling, each
outerAccum = *outerEdgeOffset; // section fills up it's allocated space in gbuf
- //uses dmin=row, rsl=col
+ // uses dmin=row, rsl=col
for (x = 0, dmin = 0; x < t; x += rw, dmin++) {
for (rsl = 0; rsl < rw; rsl++) {
a = x + rsl;
@@ -1187,7 +1192,7 @@ static void do_fillGradientBuffer(unsigned int rw,
* Pixel Index = Pixel Column + ( Pixel Row * Row Width )
*/
res[gbuf[gradientFillOffset + 1] + (gbuf[gradientFillOffset] * rw)] =
- (idist / (idist + odist)); //set intensity
+ (idist / (idist + odist)); // set intensity
}
}
diff --git a/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp b/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp
index 8d11328b63b..2c12091c458 100644
--- a/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp
+++ b/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp
@@ -147,7 +147,8 @@ void FastGaussianBlurOperation::IIR_gauss(MemoryBuffer *src,
}
// see "Recursive Gabor Filtering" by Young/VanVliet
- // all factors here in double.prec. Required, because for single.prec it seems to blow up if sigma > ~200
+ // all factors here in double.prec.
+ // Required, because for single.prec it seems to blow up if sigma > ~200
if (sigma >= 3.556f) {
q = 0.9804f * (sigma - 3.556f) + 2.5091f;
}
diff --git a/source/blender/compositor/operations/COM_GlareFogGlowOperation.cpp b/source/blender/compositor/operations/COM_GlareFogGlowOperation.cpp
index ff75fb7090f..1f5749d782c 100644
--- a/source/blender/compositor/operations/COM_GlareFogGlowOperation.cpp
+++ b/source/blender/compositor/operations/COM_GlareFogGlowOperation.cpp
@@ -83,7 +83,7 @@ static void FHT(fREAL *data, unsigned int M, unsigned int inverse)
n2 = n >> 1;
if (n > 2) {
fc = dc = cos(a);
- fs = ds = sqrt(1.0 - fc * fc); //sin(a);
+ fs = ds = sqrt(1.0 - fc * fc); // sin(a);
bd = n - 2;
for (bl = 1; bl < n2; bl++) {
fREAL *data_nbd = &data_n[bd];
@@ -431,7 +431,7 @@ void GlareFogGlowOperation::generateGlare(float *data,
fcol[1] = expf(d * cs_g);
fcol[2] = expf(d * cs_b);
// linear window good enough here, visual result counts, not scientific analysis
- //w = (1.0f-fabs(u))*(1.0f-fabs(v));
+ // w = (1.0f-fabs(u))*(1.0f-fabs(v));
// actually, Hanning window is ok, cos^2 for some reason is slower
w = (0.5f + 0.5f * cosf(u * (float)M_PI)) * (0.5f + 0.5f * cosf(v * (float)M_PI));
mul_v3_fl(fcol, w);
diff --git a/source/blender/compositor/operations/COM_MapRangeOperation.cpp b/source/blender/compositor/operations/COM_MapRangeOperation.cpp
index 46bd015163b..ff5804a63a4 100644
--- a/source/blender/compositor/operations/COM_MapRangeOperation.cpp
+++ b/source/blender/compositor/operations/COM_MapRangeOperation.cpp
@@ -39,7 +39,8 @@ void MapRangeOperation::initExecution()
this->m_destMaxOperation = this->getInputSocketReader(4);
}
-/* The code below assumes all data is inside range +- this, and that input buffer is single channel */
+/* The code below assumes all data is inside range +- this, and that input buffer is single channel
+ */
#define BLENDER_ZMAX 10000.0f
void MapRangeOperation::executePixelSampled(float output[4],
diff --git a/source/blender/compositor/operations/COM_NormalizeOperation.cpp b/source/blender/compositor/operations/COM_NormalizeOperation.cpp
index da594be2268..f7e689fa008 100644
--- a/source/blender/compositor/operations/COM_NormalizeOperation.cpp
+++ b/source/blender/compositor/operations/COM_NormalizeOperation.cpp
@@ -80,7 +80,8 @@ bool NormalizeOperation::determineDependingAreaOfInterest(rcti * /*input*/,
return false;
}
-/* The code below assumes all data is inside range +- this, and that input buffer is single channel */
+/* The code below assumes all data is inside range +- this, and that input buffer is single channel
+ */
#define BLENDER_ZMAX 10000.0f
void *NormalizeOperation::initializeTileData(rcti *rect)
diff --git a/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp b/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp
index f6cbb8f69c1..9d1be09de0e 100644
--- a/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp
+++ b/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp
@@ -39,7 +39,7 @@ extern "C" {
#include "IMB_imbuf_types.h"
}
-/************************************ OpenEXR Singlelayer Multiview *****************************************/
+/************************************ OpenEXR Singlelayer Multiview ******************************/
OutputOpenExrSingleLayerMultiViewOperation::OutputOpenExrSingleLayerMultiViewOperation(
const RenderData *rd,
@@ -142,7 +142,7 @@ void OutputOpenExrSingleLayerMultiViewOperation::deinitExecution()
}
}
-/************************************ OpenEXR Multilayer Multiview *****************************************/
+/************************************ OpenEXR Multilayer Multiview *******************************/
OutputOpenExrMultiLayerMultiViewOperation::OutputOpenExrMultiLayerMultiViewOperation(
const RenderData *rd,
diff --git a/source/blender/compositor/operations/COM_PlaneCornerPinOperation.cpp b/source/blender/compositor/operations/COM_PlaneCornerPinOperation.cpp
index 90bc859a1bb..313be2f5ecf 100644
--- a/source/blender/compositor/operations/COM_PlaneCornerPinOperation.cpp
+++ b/source/blender/compositor/operations/COM_PlaneCornerPinOperation.cpp
@@ -223,5 +223,8 @@ bool PlaneCornerPinWarpImageOperation::determineDependingAreaOfInterest(
output->xmax = getInputOperation(0)->getWidth();
output->ymax = getInputOperation(0)->getHeight();
return true;
- // return PlaneDistortWarpImageOperation::determineDependingAreaOfInterest(input, readOperation, output);
+#if 0
+ return PlaneDistortWarpImageOperation::determineDependingAreaOfInterest(
+ input, readOperation, output);
+#endif
}
diff --git a/source/blender/compositor/operations/COM_ScaleOperation.cpp b/source/blender/compositor/operations/COM_ScaleOperation.cpp
index 3663d56dc87..1c5b2a71859 100644
--- a/source/blender/compositor/operations/COM_ScaleOperation.cpp
+++ b/source/blender/compositor/operations/COM_ScaleOperation.cpp
@@ -155,7 +155,7 @@ void ScaleAbsoluteOperation::executePixelSampled(float output[4],
const float width = this->getWidth();
const float height = this->getHeight();
- //div
+ // div
float relativeXScale = scx / width;
float relativeYScale = scy / height;
@@ -181,7 +181,7 @@ bool ScaleAbsoluteOperation::determineDependingAreaOfInterest(rcti *input,
const float scy = scaleY[0];
const float width = this->getWidth();
const float height = this->getHeight();
- //div
+ // div
float relateveXScale = scx / width;
float relateveYScale = scy / height;
diff --git a/source/blender/compositor/operations/COM_SunBeamsOperation.cpp b/source/blender/compositor/operations/COM_SunBeamsOperation.cpp
index 80b1c1f798a..6f47e0e190b 100644
--- a/source/blender/compositor/operations/COM_SunBeamsOperation.cpp
+++ b/source/blender/compositor/operations/COM_SunBeamsOperation.cpp
@@ -146,8 +146,8 @@ template<int fxu, int fxv, int fyu, int fyv> struct BufferLineAccumulator {
* Perform the actual accumulation along a ray segment from source to pt.
* Only pixels within dist_min..dist_max contribute.
*
- * The loop runs backwards(!) over the primary sector space axis u, i.e. increasing distance to pt.
- * After each step it decrements v by dv < 1, adding a buffer shift when necessary.
+ * The loop runs backwards(!) over the primary sector space axis u, i.e. increasing distance to
+ * pt. After each step it decrements v by dv < 1, adding a buffer shift when necessary.
*/
static void eval(MemoryBuffer *input,
float output[4],
@@ -229,11 +229,12 @@ template<int fxu, int fxv, int fyu, int fyv> struct BufferLineAccumulator {
};
/**
- * Dispatch function which selects an appropriate accumulator based on the sector of the target point,
- * relative to the source.
+ * Dispatch function which selects an appropriate accumulator based on the sector of the target
+ * point, relative to the source.
*
* The BufferLineAccumulator defines the actual loop over the buffer, with an efficient inner loop
- * due to using compile time constants instead of a local matrix variable defining the sector space.
+ * due to using compile time constants instead of a local matrix variable defining the sector
+ * space.
*/
static void accumulate_line(MemoryBuffer *input,
float output[4],
diff --git a/source/blender/compositor/operations/COM_TextureOperation.cpp b/source/blender/compositor/operations/COM_TextureOperation.cpp
index 4cc9d7a748c..f2d78845b6c 100644
--- a/source/blender/compositor/operations/COM_TextureOperation.cpp
+++ b/source/blender/compositor/operations/COM_TextureOperation.cpp
@@ -29,8 +29,8 @@ extern "C" {
TextureBaseOperation::TextureBaseOperation() : NodeOperation()
{
- this->addInputSocket(COM_DT_VECTOR); //offset
- this->addInputSocket(COM_DT_VECTOR); //size
+ this->addInputSocket(COM_DT_VECTOR); // offset
+ this->addInputSocket(COM_DT_VECTOR); // size
this->m_texture = NULL;
this->m_inputSize = NULL;
this->m_inputOffset = NULL;
diff --git a/source/blender/compositor/operations/COM_VectorBlurOperation.cpp b/source/blender/compositor/operations/COM_VectorBlurOperation.cpp
index fb86b04cff7..8e67b8ac786 100644
--- a/source/blender/compositor/operations/COM_VectorBlurOperation.cpp
+++ b/source/blender/compositor/operations/COM_VectorBlurOperation.cpp
@@ -46,7 +46,7 @@ VectorBlurOperation::VectorBlurOperation() : NodeOperation()
{
this->addInputSocket(COM_DT_COLOR);
this->addInputSocket(COM_DT_VALUE); // ZBUF
- this->addInputSocket(COM_DT_COLOR); //SPEED
+ this->addInputSocket(COM_DT_COLOR); // SPEED
this->addOutputSocket(COM_DT_COLOR);
this->m_settings = NULL;
this->m_cachedInstance = NULL;
@@ -409,7 +409,8 @@ static void zbuf_fill_in_rgba(
}
/* char value==255 is filled in, rest should be zero */
-/* returns alpha values, but sets alpha to 1 for zero alpha pixels that have an alpha value as neighbor */
+/* returns alpha values,
+ * but sets alpha to 1 for zero alpha pixels that have an alpha value as neighbor. */
void antialias_tagbuf(int xsize, int ysize, char *rectmove)
{
char *row1, *row2, *row3;
diff --git a/source/blender/compositor/operations/COM_WrapOperation.cpp b/source/blender/compositor/operations/COM_WrapOperation.cpp
index cb119fb4f1d..c25e8ba897c 100644
--- a/source/blender/compositor/operations/COM_WrapOperation.cpp
+++ b/source/blender/compositor/operations/COM_WrapOperation.cpp
@@ -53,7 +53,7 @@ void WrapOperation::executePixelSampled(float output[4], float x, float y, Pixel
MemoryBufferExtend extend_x = COM_MB_CLIP, extend_y = COM_MB_CLIP;
switch (m_wrappingType) {
case CMP_NODE_WRAP_NONE:
- //Intentionally empty, originalXPos and originalYPos have been set before
+ // Intentionally empty, originalXPos and originalYPos have been set before
break;
case CMP_NODE_WRAP_X:
// wrap only on the x-axis
diff --git a/source/blender/compositor/operations/COM_ZCombineOperation.cpp b/source/blender/compositor/operations/COM_ZCombineOperation.cpp
index 222f42e8241..767280e2cd2 100644
--- a/source/blender/compositor/operations/COM_ZCombineOperation.cpp
+++ b/source/blender/compositor/operations/COM_ZCombineOperation.cpp
@@ -97,7 +97,7 @@ void ZCombineOperation::deinitExecution()
// MASK combine
ZCombineMaskOperation::ZCombineMaskOperation() : NodeOperation()
{
- this->addInputSocket(COM_DT_VALUE); //mask
+ this->addInputSocket(COM_DT_VALUE); // mask
this->addInputSocket(COM_DT_COLOR);
this->addInputSocket(COM_DT_COLOR);
this->addOutputSocket(COM_DT_COLOR);