[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48296] trunk/blender/source/blender/ compositor: use m_ prefix for compositor class members ( all compositor operations).
Campbell Barton
ideasman42 at gmail.com
Tue Jun 26 03:22:06 CEST 2012
Revision: 48296
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48296
Author: campbellbarton
Date: 2012-06-26 01:22:05 +0000 (Tue, 26 Jun 2012)
Log Message:
-----------
use m_ prefix for compositor class members (all compositor operations).
Modified Paths:
--------------
trunk/blender/source/blender/compositor/intern/COM_NodeOperation.cpp
trunk/blender/source/blender/compositor/intern/COM_NodeOperation.h
trunk/blender/source/blender/compositor/intern/COM_SocketReader.h
trunk/blender/source/blender/compositor/operations/COM_AlphaOverKeyOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_AntiAliasOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_AntiAliasOperation.h
trunk/blender/source/blender/compositor/operations/COM_BilateralBlurOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_BilateralBlurOperation.h
trunk/blender/source/blender/compositor/operations/COM_BlurBaseOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_BlurBaseOperation.h
trunk/blender/source/blender/compositor/operations/COM_BokehBlurOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_BokehBlurOperation.h
trunk/blender/source/blender/compositor/operations/COM_BokehImageOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_BokehImageOperation.h
trunk/blender/source/blender/compositor/operations/COM_BoxMaskOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_BoxMaskOperation.h
trunk/blender/source/blender/compositor/operations/COM_BrightnessOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_BrightnessOperation.h
trunk/blender/source/blender/compositor/operations/COM_CalculateMeanOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_CalculateMeanOperation.h
trunk/blender/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h
trunk/blender/source/blender/compositor/operations/COM_ChangeHSVOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ChangeHSVOperation.h
trunk/blender/source/blender/compositor/operations/COM_ChannelMatteOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ChannelMatteOperation.h
trunk/blender/source/blender/compositor/operations/COM_ChromaMatteOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ChromaMatteOperation.h
trunk/blender/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.h
trunk/blender/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.h
trunk/blender/source/blender/compositor/operations/COM_ColorCorrectionOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ColorCorrectionOperation.h
trunk/blender/source/blender/compositor/operations/COM_ColorCurveOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ColorCurveOperation.h
trunk/blender/source/blender/compositor/operations/COM_ColorMatteOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ColorMatteOperation.h
trunk/blender/source/blender/compositor/operations/COM_ColorRampOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ColorRampOperation.h
trunk/blender/source/blender/compositor/operations/COM_ColorSpillOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ColorSpillOperation.h
trunk/blender/source/blender/compositor/operations/COM_CombineChannelsOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_CombineChannelsOperation.h
trunk/blender/source/blender/compositor/operations/COM_CompositorOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_CompositorOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertColorProfileOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertColorProfileOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertColorToBWOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertColorToBWOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertColourToValueProg.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertColourToValueProg.h
trunk/blender/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertKeyToPremulOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertKeyToPremulOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertPremulToKeyOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertPremulToKeyOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertValueToColourProg.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertValueToColourProg.h
trunk/blender/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvolutionFilterOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvolutionFilterOperation.h
trunk/blender/source/blender/compositor/operations/COM_CropOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_CropOperation.h
trunk/blender/source/blender/compositor/operations/COM_CurveBaseOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_CurveBaseOperation.h
trunk/blender/source/blender/compositor/operations/COM_DifferenceMatteOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_DifferenceMatteOperation.h
trunk/blender/source/blender/compositor/operations/COM_DilateErodeOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_DilateErodeOperation.h
trunk/blender/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_DirectionalBlurOperation.h
trunk/blender/source/blender/compositor/operations/COM_DisplaceOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_DisplaceOperation.h
trunk/blender/source/blender/compositor/operations/COM_DisplaceSimpleOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_DisplaceSimpleOperation.h
trunk/blender/source/blender/compositor/operations/COM_DistanceMatteOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_DistanceMatteOperation.h
trunk/blender/source/blender/compositor/operations/COM_DotproductOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_DotproductOperation.h
trunk/blender/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.h
trunk/blender/source/blender/compositor/operations/COM_EllipseMaskOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_EllipseMaskOperation.h
trunk/blender/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h
trunk/blender/source/blender/compositor/operations/COM_FlipOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_FlipOperation.h
trunk/blender/source/blender/compositor/operations/COM_GammaCorrectOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_GammaCorrectOperation.h
trunk/blender/source/blender/compositor/operations/COM_GammaOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_GammaOperation.h
trunk/blender/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.h
trunk/blender/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.h
trunk/blender/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h
trunk/blender/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_GaussianXBlurOperation.h
trunk/blender/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_GaussianYBlurOperation.h
trunk/blender/source/blender/compositor/operations/COM_GlareBaseOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_GlareBaseOperation.h
trunk/blender/source/blender/compositor/operations/COM_GlareFogGlowOperation.h
trunk/blender/source/blender/compositor/operations/COM_GlareGhostOperation.h
trunk/blender/source/blender/compositor/operations/COM_GlareSimpleStarOperation.h
trunk/blender/source/blender/compositor/operations/COM_GlareStreaksOperation.h
trunk/blender/source/blender/compositor/operations/COM_GlareThresholdOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_GlareThresholdOperation.h
trunk/blender/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.h
trunk/blender/source/blender/compositor/operations/COM_IDMaskOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_IDMaskOperation.h
trunk/blender/source/blender/compositor/operations/COM_ImageOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ImageOperation.h
trunk/blender/source/blender/compositor/operations/COM_InvertOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_InvertOperation.h
trunk/blender/source/blender/compositor/operations/COM_KeyingBlurOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_KeyingBlurOperation.h
trunk/blender/source/blender/compositor/operations/COM_KeyingClipOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_KeyingClipOperation.h
trunk/blender/source/blender/compositor/operations/COM_KeyingDespillOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_KeyingDespillOperation.h
trunk/blender/source/blender/compositor/operations/COM_KeyingOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_KeyingOperation.h
trunk/blender/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_KeyingScreenOperation.h
trunk/blender/source/blender/compositor/operations/COM_LuminanceMatteOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_LuminanceMatteOperation.h
trunk/blender/source/blender/compositor/operations/COM_MapUVOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MapUVOperation.h
trunk/blender/source/blender/compositor/operations/COM_MapValueOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MapValueOperation.h
trunk/blender/source/blender/compositor/operations/COM_MaskOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MaskOperation.h
trunk/blender/source/blender/compositor/operations/COM_MathBaseOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MathBaseOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixAddOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixBaseOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixBaseOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixBlendOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixBurnOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixColorOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixDarkenOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixDifferenceOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixDivideOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixDodgeOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixGlareOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixHueOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixLightenOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixLinearLightOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixMultiplyOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixOverlayOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixSaturationOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixScreenOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixSoftLightOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixSubtractOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MixValueOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MovieClipAttributeOperation.h
trunk/blender/source/blender/compositor/operations/COM_MovieClipOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MovieClipOperation.h
trunk/blender/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MovieDistortionOperation.h
trunk/blender/source/blender/compositor/operations/COM_MultilayerImageOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MultilayerImageOperation.h
trunk/blender/source/blender/compositor/operations/COM_NormalizeOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_NormalizeOperation.h
trunk/blender/source/blender/compositor/operations/COM_OutputFileOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_OutputFileOperation.h
trunk/blender/source/blender/compositor/operations/COM_PreviewOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_PreviewOperation.h
trunk/blender/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.h
trunk/blender/source/blender/compositor/operations/COM_QualityStepHelper.cpp
trunk/blender/source/blender/compositor/operations/COM_QualityStepHelper.h
trunk/blender/source/blender/compositor/operations/COM_ReadBufferOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ReadBufferOperation.h
trunk/blender/source/blender/compositor/operations/COM_RenderLayersBaseProg.cpp
trunk/blender/source/blender/compositor/operations/COM_RenderLayersBaseProg.h
trunk/blender/source/blender/compositor/operations/COM_RenderLayersMistOperation.h
trunk/blender/source/blender/compositor/operations/COM_RotateOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_RotateOperation.h
trunk/blender/source/blender/compositor/operations/COM_ScaleOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ScaleOperation.h
trunk/blender/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.h
trunk/blender/source/blender/compositor/operations/COM_SeparateChannelOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_SeparateChannelOperation.h
trunk/blender/source/blender/compositor/operations/COM_SetAlphaOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_SetAlphaOperation.h
trunk/blender/source/blender/compositor/operations/COM_SetColorOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_SetColorOperation.h
trunk/blender/source/blender/compositor/operations/COM_SetSamplerOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_SetSamplerOperation.h
trunk/blender/source/blender/compositor/operations/COM_SetValueOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_SetValueOperation.h
trunk/blender/source/blender/compositor/operations/COM_SetVectorOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_SetVectorOperation.h
trunk/blender/source/blender/compositor/operations/COM_SocketProxyOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_SocketProxyOperation.h
trunk/blender/source/blender/compositor/operations/COM_SplitViewerOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_SplitViewerOperation.h
trunk/blender/source/blender/compositor/operations/COM_TextureOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_TextureOperation.h
trunk/blender/source/blender/compositor/operations/COM_TonemapOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_TonemapOperation.h
trunk/blender/source/blender/compositor/operations/COM_TranslateOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_TranslateOperation.h
trunk/blender/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h
trunk/blender/source/blender/compositor/operations/COM_VectorBlurOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_VectorBlurOperation.h
trunk/blender/source/blender/compositor/operations/COM_VectorCurveOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_VectorCurveOperation.h
trunk/blender/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ViewerBaseOperation.h
trunk/blender/source/blender/compositor/operations/COM_ViewerOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ViewerOperation.h
trunk/blender/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_WriteBufferOperation.h
trunk/blender/source/blender/compositor/operations/COM_ZCombineOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ZCombineOperation.h
Modified: trunk/blender/source/blender/compositor/intern/COM_NodeOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_NodeOperation.cpp 2012-06-26 01:18:30 UTC (rev 48295)
+++ trunk/blender/source/blender/compositor/intern/COM_NodeOperation.cpp 2012-06-26 01:22:05 UTC (rev 48296)
@@ -30,12 +30,12 @@
NodeOperation::NodeOperation()
{
- this->resolutionInputSocketIndex = 0;
- this->complex = false;
- this->width = 0;
- this->height = 0;
- this->openCL = false;
- this->btree = NULL;
+ this->m_resolutionInputSocketIndex = 0;
+ this->m_complex = false;
+ this->m_width = 0;
+ this->m_height = 0;
+ this->m_openCL = false;
+ this->m_btree = NULL;
}
void NodeOperation::determineResolution(unsigned int resolution[], unsigned int preferredResolution[])
@@ -47,7 +47,7 @@
for (unsigned int index = 0; index < inputsockets.size(); index++) {
InputSocket *inputSocket = inputsockets[index];
if (inputSocket->isConnected()) {
- if (index == this->resolutionInputSocketIndex) {
+ if (index == this->m_resolutionInputSocketIndex) {
inputSocket->determineResolution(resolution, preferredResolution);
temp2[0] = resolution[0];
temp2[1] = resolution[1];
@@ -58,7 +58,7 @@
for (unsigned int index = 0; index < inputsockets.size(); index++) {
InputSocket *inputSocket = inputsockets[index];
if (inputSocket->isConnected()) {
- if (index != resolutionInputSocketIndex) {
+ if (index != this->m_resolutionInputSocketIndex) {
inputSocket->determineResolution(temp, temp2);
}
}
@@ -66,7 +66,7 @@
}
void NodeOperation::setResolutionInputSocketIndex(unsigned int index)
{
- this->resolutionInputSocketIndex = index;
+ this->m_resolutionInputSocketIndex = index;
}
void NodeOperation::initExecution()
{
@@ -75,22 +75,22 @@
void NodeOperation::initMutex()
{
- BLI_mutex_init(&mutex);
+ BLI_mutex_init(&this->m_mutex);
}
void NodeOperation::lockMutex()
{
- BLI_mutex_lock(&mutex);
+ BLI_mutex_lock(&this->m_mutex);
}
void NodeOperation::unlockMutex()
{
- BLI_mutex_unlock(&mutex);
+ BLI_mutex_unlock(&this->m_mutex);
}
void NodeOperation::deinitMutex()
{
- BLI_mutex_end(&mutex);
+ BLI_mutex_end(&this->m_mutex);
}
void NodeOperation::deinitExecution()
Modified: trunk/blender/source/blender/compositor/intern/COM_NodeOperation.h
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_NodeOperation.h 2012-06-26 01:18:30 UTC (rev 48295)
+++ trunk/blender/source/blender/compositor/intern/COM_NodeOperation.h 2012-06-26 01:22:05 UTC (rev 48296)
@@ -49,7 +49,7 @@
/**
* @brief the index of the input socket that will be used to determine the resolution
*/
- unsigned int resolutionInputSocketIndex;
+ unsigned int m_resolutionInputSocketIndex;
/**
* @brief is this operation a complex one.
@@ -57,13 +57,13 @@
* Complex operations are typically doing many reads to calculate the output of a single pixel.
* Mostly Filter types (Blurs, Convolution, Defocus etc) need this to be set to true.
*/
- bool complex;
+ bool m_complex;
/**
* @brief can this operation be scheduled on an OpenCL device.
* @note Only applicable if complex is True
*/
- bool openCL;
+ bool m_openCL;
/**
* @brief mutex reference for very special node initializations
@@ -74,12 +74,12 @@
* @see NodeOperation.deinitMutex deinitializes this mutex
* @see NodeOperation.getMutex retrieve a pointer to this mutex.
*/
- ThreadMutex mutex;
+ ThreadMutex m_mutex;
/**
* @brief reference to the editing bNodeTree only used for break callback
*/
- const bNodeTree *btree;
+ const bNodeTree *m_btree;
public:
/**
@@ -124,7 +124,7 @@
virtual int isBufferOperation() { return false; }
virtual int isSingleThreaded() { return false; }
- void setbNodeTree(const bNodeTree *tree) { this->btree = tree; }
+ void setbNodeTree(const bNodeTree *tree) { this->m_btree = tree; }
virtual void initExecution();
/**
@@ -167,7 +167,7 @@
virtual void deinitExecution();
bool isResolutionSet() {
- return this->width != 0 && height != 0;
+ return this->m_width != 0 && this->m_height != 0;
}
/**
@@ -176,8 +176,8 @@
*/
void setResolution(unsigned int resolution[]) {
if (!isResolutionSet()) {
- this->width = resolution[0];
- this->height = resolution[1];
+ this->m_width = resolution[0];
+ this->m_height = resolution[1];
}
}
@@ -190,7 +190,7 @@
* Complex operations are typically doing many reads to calculate the output of a single pixel.
* Mostly Filter types (Blurs, Convolution, Defocus etc) need this to be set to true.
*/
- const bool isComplex() const { return this->complex; }
+ const bool isComplex() const { return this->m_complex; }
virtual const bool isSetOperation() const { return false; }
/**
@@ -235,20 +235,20 @@
* @see WorkScheduler.schedule
* @see ExecutionGroup.addOperation
*/
- bool isOpenCL() { return this->openCL; }
+ bool isOpenCL() { return this->m_openCL; }
virtual bool isViewerOperation() { return false; }
virtual bool isPreviewOperation() { return false; }
inline bool isBreaked() {
- return btree->test_break(btree->tbh);
+ return this->m_btree->test_break(this->m_btree->tbh);
}
protected:
NodeOperation();
- void setWidth(unsigned int width) { this->width = width; }
- void setHeight(unsigned int height) { this->height = height; }
+ void setWidth(unsigned int width) { this->m_width = width; }
+ void setHeight(unsigned int height) { this->m_height = height; }
SocketReader *getInputSocketReader(unsigned int inputSocketindex);
NodeOperation *getInputOperation(unsigned int inputSocketindex);
@@ -264,12 +264,12 @@
* Complex operations are typically doing many reads to calculate the output of a single pixel.
* Mostly Filter types (Blurs, Convolution, Defocus etc) need this to be set to true.
*/
- void setComplex(bool complex) { this->complex = complex; }
+ void setComplex(bool complex) { this->m_complex = complex; }
/**
* @brief set if this NodeOperation can be scheduled on a OpenCLDevice
*/
- void setOpenCL(bool openCL) { this->openCL = openCL; }
+ void setOpenCL(bool openCL) { this->m_openCL = openCL; }
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("COM:NodeOperation")
Modified: trunk/blender/source/blender/compositor/intern/COM_SocketReader.h
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_SocketReader.h 2012-06-26 01:18:30 UTC (rev 48295)
+++ trunk/blender/source/blender/compositor/intern/COM_SocketReader.h 2012-06-26 01:22:05 UTC (rev 48296)
@@ -47,12 +47,12 @@
/**
* @brief Holds the width of the output of this operation.
*/
- unsigned int width;
+ unsigned int m_width;
/**
* @brief Holds the height of the output of this operation.
*/
- unsigned int height;
+ unsigned int m_height;
/**
@@ -108,8 +108,8 @@
virtual MemoryBuffer *getInputMemoryBuffer(MemoryBuffer **memoryBuffers) { return 0; }
- inline const unsigned int getWidth() const { return this->width; }
- inline const unsigned int getHeight() const { return this->height; }
+ inline const unsigned int getWidth() const { return this->m_width; }
+ inline const unsigned int getHeight() const { return this->m_height; }
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("COM:SocketReader")
Modified: trunk/blender/source/blender/compositor/operations/COM_AlphaOverKeyOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_AlphaOverKeyOperation.cpp 2012-06-26 01:18:30 UTC (rev 48295)
+++ trunk/blender/source/blender/compositor/operations/COM_AlphaOverKeyOperation.cpp 2012-06-26 01:22:05 UTC (rev 48296)
@@ -33,9 +33,9 @@
float inputOverColor[4];
float value[4];
- inputValueOperation->read(value, x, y, sampler, inputBuffers);
- inputColor1Operation->read(inputColor1, x, y, sampler, inputBuffers);
- inputColor2Operation->read(inputOverColor, x, y, sampler, inputBuffers);
+ this->m_inputValueOperation->read(value, x, y, sampler, inputBuffers);
+ this->m_inputColor1Operation->read(inputColor1, x, y, sampler, inputBuffers);
+ this->m_inputColor2Operation->read(inputOverColor, x, y, sampler, inputBuffers);
if (inputOverColor[3] <= 0.0f) {
copy_v4_v4(outputValue, inputColor1);
Modified: trunk/blender/source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp 2012-06-26 01:18:30 UTC (rev 48295)
+++ trunk/blender/source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp 2012-06-26 01:22:05 UTC (rev 48296)
@@ -33,9 +33,9 @@
float inputOverColor[4];
float value[4];
- inputValueOperation->read(value, x, y, sampler, inputBuffers);
- inputColor1Operation->read(inputColor1, x, y, sampler, inputBuffers);
- inputColor2Operation->read(inputOverColor, x, y, sampler, inputBuffers);
+ this->m_inputValueOperation->read(value, x, y, sampler, inputBuffers);
+ this->m_inputColor1Operation->read(inputColor1, x, y, sampler, inputBuffers);
+ this->m_inputColor2Operation->read(inputOverColor, x, y, sampler, inputBuffers);
if (inputOverColor[3] <= 0.0f) {
copy_v4_v4(outputValue, inputColor1);
Modified: trunk/blender/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.cpp 2012-06-26 01:18:30 UTC (rev 48295)
+++ trunk/blender/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.cpp 2012-06-26 01:22:05 UTC (rev 48296)
@@ -33,9 +33,9 @@
float inputOverColor[4];
float value[4];
- inputValueOperation->read(value, x, y, sampler, inputBuffers);
- inputColor1Operation->read(inputColor1, x, y, sampler, inputBuffers);
- inputColor2Operation->read(inputOverColor, x, y, sampler, inputBuffers);
+ this->m_inputValueOperation->read(value, x, y, sampler, inputBuffers);
+ this->m_inputColor1Operation->read(inputColor1, x, y, sampler, inputBuffers);
+ this->m_inputColor2Operation->read(inputOverColor, x, y, sampler, inputBuffers);
/* Zero alpha values should still permit an add of RGB data */
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list