Revision: 48299
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48299
Author: campbellbarton
Date: 2012-06-26 07:09:49 +0000 (Tue, 26 Jun 2012)
Log Message:
-----------
rename remaining class members with m_ prefix.
Modified Paths:
--------------
trunk/blender/source/blender/compositor/intern/COM_ChannelInfo.cpp
trunk/blender/source/blender/compositor/intern/COM_ChannelInfo.h
trunk/blender/source/blender/compositor/intern/COM_ChunkOrder.cpp
trunk/blender/source/blender/compositor/intern/COM_ChunkOrder.h
trunk/blender/source/blender/compositor/intern/COM_ChunkOrderHotspot.cpp
trunk/blender/source/blender/compositor/intern/COM_ChunkOrderHotspot.h
trunk/blender/source/blender/compositor/intern/COM_CompositorContext.cpp
trunk/blender/source/blender/compositor/intern/COM_CompositorContext.h
trunk/blender/source/blender/compositor/intern/COM_ExecutionGroup.cpp
trunk/blender/source/blender/compositor/intern/COM_ExecutionGroup.h
trunk/blender/source/blender/compositor/intern/COM_ExecutionSystem.cpp
trunk/blender/source/blender/compositor/intern/COM_ExecutionSystem.h
trunk/blender/source/blender/compositor/intern/COM_InputSocket.cpp
trunk/blender/source/blender/compositor/intern/COM_InputSocket.h
trunk/blender/source/blender/compositor/intern/COM_MemoryBuffer.cpp
trunk/blender/source/blender/compositor/intern/COM_MemoryBuffer.h
trunk/blender/source/blender/compositor/intern/COM_MemoryProxy.cpp
trunk/blender/source/blender/compositor/intern/COM_MemoryProxy.h
trunk/blender/source/blender/compositor/intern/COM_Node.cpp
trunk/blender/source/blender/compositor/intern/COM_Node.h
trunk/blender/source/blender/compositor/intern/COM_NodeBase.cpp
trunk/blender/source/blender/compositor/intern/COM_NodeBase.h
trunk/blender/source/blender/compositor/intern/COM_OpenCLDevice.cpp
trunk/blender/source/blender/compositor/intern/COM_OpenCLDevice.h
trunk/blender/source/blender/compositor/intern/COM_OutputSocket.cpp
trunk/blender/source/blender/compositor/intern/COM_OutputSocket.h
trunk/blender/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.cpp
trunk/blender/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.h
trunk/blender/source/blender/compositor/intern/COM_Socket.cpp
trunk/blender/source/blender/compositor/intern/COM_Socket.h
trunk/blender/source/blender/compositor/intern/COM_SocketConnection.cpp
trunk/blender/source/blender/compositor/intern/COM_SocketConnection.h
trunk/blender/source/blender/compositor/intern/COM_WorkPackage.cpp
trunk/blender/source/blender/compositor/intern/COM_WorkPackage.h
trunk/blender/source/blender/compositor/nodes/COM_AlphaOverNode.h
trunk/blender/source/blender/compositor/nodes/COM_BlurNode.h
trunk/blender/source/blender/compositor/nodes/COM_BokehBlurNode.h
trunk/blender/source/blender/compositor/nodes/COM_ChannelMatteNode.h
trunk/blender/source/blender/compositor/nodes/COM_ChromaMatteNode.h
trunk/blender/source/blender/compositor/nodes/COM_ColorBalanceNode.h
trunk/blender/source/blender/compositor/nodes/COM_ColorMatteNode.h
trunk/blender/source/blender/compositor/nodes/COM_ColorRampNode.h
trunk/blender/source/blender/compositor/nodes/COM_ColorSpillNode.h
trunk/blender/source/blender/compositor/nodes/COM_ColorToBWNode.h
trunk/blender/source/blender/compositor/nodes/COM_CombineHSVANode.h
trunk/blender/source/blender/compositor/nodes/COM_CombineRGBANode.h
trunk/blender/source/blender/compositor/nodes/COM_CombineYCCANode.h
trunk/blender/source/blender/compositor/nodes/COM_CombineYUVANode.h
trunk/blender/source/blender/compositor/nodes/COM_CompositorNode.h
trunk/blender/source/blender/compositor/nodes/COM_ConvertAlphaNode.h
trunk/blender/source/blender/compositor/nodes/COM_CropNode.h
trunk/blender/source/blender/compositor/nodes/COM_DefocusNode.h
trunk/blender/source/blender/compositor/nodes/COM_DifferenceMatteNode.h
trunk/blender/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_DilateErodeNode.h
trunk/blender/source/blender/compositor/nodes/COM_DisplaceNode.h
trunk/blender/source/blender/compositor/nodes/COM_DistanceMatteNode.h
trunk/blender/source/blender/compositor/nodes/COM_FilterNode.h
trunk/blender/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.h
trunk/blender/source/blender/compositor/nodes/COM_HueSaturationValueNode.h
trunk/blender/source/blender/compositor/nodes/COM_ImageNode.h
trunk/blender/source/blender/compositor/nodes/COM_KeyingNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_KeyingNode.h
trunk/blender/source/blender/compositor/nodes/COM_KeyingScreenNode.h
trunk/blender/source/blender/compositor/nodes/COM_LuminanceMatteNode.h
trunk/blender/source/blender/compositor/nodes/COM_MapUVNode.h
trunk/blender/source/blender/compositor/nodes/COM_MapValueNode.h
trunk/blender/source/blender/compositor/nodes/COM_MaskNode.h
trunk/blender/source/blender/compositor/nodes/COM_MathNode.h
trunk/blender/source/blender/compositor/nodes/COM_MixNode.h
trunk/blender/source/blender/compositor/nodes/COM_MovieClipNode.h
trunk/blender/source/blender/compositor/nodes/COM_NormalNode.h
trunk/blender/source/blender/compositor/nodes/COM_OutputFileNode.h
trunk/blender/source/blender/compositor/nodes/COM_SeparateHSVANode.h
trunk/blender/source/blender/compositor/nodes/COM_SeparateRGBANode.h
trunk/blender/source/blender/compositor/nodes/COM_SeparateYCCANode.h
trunk/blender/source/blender/compositor/nodes/COM_SeparateYUVANode.h
trunk/blender/source/blender/compositor/nodes/COM_SetAlphaNode.h
trunk/blender/source/blender/compositor/nodes/COM_SplitViewerNode.h
trunk/blender/source/blender/compositor/nodes/COM_Stabilize2dNode.h
trunk/blender/source/blender/compositor/nodes/COM_SwitchNode.h
trunk/blender/source/blender/compositor/nodes/COM_TransformNode.h
trunk/blender/source/blender/compositor/nodes/COM_ViewerNode.h
trunk/blender/source/blender/compositor/nodes/COM_ZCombineNode.h
Modified: trunk/blender/source/blender/compositor/intern/COM_ChannelInfo.cpp
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_ChannelInfo.cpp
2012-06-26 04:44:08 UTC (rev 48298)
+++ trunk/blender/source/blender/compositor/intern/COM_ChannelInfo.cpp
2012-06-26 07:09:49 UTC (rev 48299)
@@ -29,7 +29,7 @@
*/
ChannelInfo::ChannelInfo()
{
- this->number = 0;
- this->premultiplied = true;
- this->type = COM_CT_UNUSED;
+ this->m_number = 0;
+ this->m_premultiplied = true;
+ this->m_type = COM_CT_UNUSED;
}
Modified: trunk/blender/source/blender/compositor/intern/COM_ChannelInfo.h
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_ChannelInfo.h
2012-06-26 04:44:08 UTC (rev 48298)
+++ trunk/blender/source/blender/compositor/intern/COM_ChannelInfo.h
2012-06-26 07:09:49 UTC (rev 48299)
@@ -61,23 +61,23 @@
/**
* @brief the channel number, in the connection. [0-3]
*/
- int number;
+ int m_number;
/**
* @brief type of channel
*/
- ChannelType type;
+ ChannelType m_type;
/**
* @brieg Is this value in this channel premultiplied with its alpha
* @note only valid if type = ColorComponent;
*/
- bool premultiplied;
+ bool m_premultiplied;
// /**
-// * Color space of this value.
-// * only valid when type = ColorComponent;
-// */
+// * Color space of this value.
+// * only valid when type = ColorComponent;
+// */
// string colorspacename;
public:
@@ -89,32 +89,32 @@
/**
* @brief set the index of this channel in the SocketConnection
*/
- void setNumber(const int number) { this->number = number; }
+ void setNumber(const int number) { this->m_number = number; }
/**
* @brief get the index of this channel in the SocketConnection
*/
- const int getNumber() const { return this->number; }
+ const int getNumber() const { return this->m_number; }
/**
* @brief set the type of channel
*/
- void setType(const ChannelType type) { this->type = type; }
+ void setType(const ChannelType type) { this->m_type = type; }
/**
* @brief get the type of channel
*/
- const ChannelType getType() const { return this->type; }
+ const ChannelType getType() const { return this->m_type; }
/**
* @brief set the premultiplicatioin of this channel
*/
- void setPremultiplied(const bool premultiplied) { this->premultiplied =
premultiplied; }
+ void setPremultiplied(const bool premultiplied) { this->m_premultiplied
= premultiplied; }
/**
* @brief is this channel premultiplied
*/
- const bool isPremultiplied() const { return this->premultiplied; }
+ const bool isPremultiplied() const { return this->m_premultiplied; }
};
Modified: trunk/blender/source/blender/compositor/intern/COM_ChunkOrder.cpp
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_ChunkOrder.cpp
2012-06-26 04:44:08 UTC (rev 48298)
+++ trunk/blender/source/blender/compositor/intern/COM_ChunkOrder.cpp
2012-06-26 07:09:49 UTC (rev 48299)
@@ -25,10 +25,10 @@
ChunkOrder::ChunkOrder()
{
- this->distance = 0.0;
- this->number = 0;
- this->x = 0;
- this->y = 0;
+ this->m_distance = 0.0;
+ this->m_number = 0;
+ this->m_x = 0;
+ this->m_y = 0;
}
void ChunkOrder::determineDistance(ChunkOrderHotspot **hotspots, unsigned int
numberOfHotspots)
@@ -37,15 +37,15 @@
double distance = MAXFLOAT;
for (index = 0; index < numberOfHotspots; index++) {
ChunkOrderHotspot *hotspot = hotspots[index];
- double ndistance = hotspot->determineDistance(this->x, this->y);
+ double ndistance = hotspot->determineDistance(this->m_x,
this->m_y);
if (ndistance < distance) {
distance = ndistance;
}
}
- this->distance = distance;
+ this->m_distance = distance;
}
bool operator<(const ChunkOrder& a, const ChunkOrder& b)
{
- return a.distance < b.distance;
+ return a.m_distance < b.m_distance;
}
Modified: trunk/blender/source/blender/compositor/intern/COM_ChunkOrder.h
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_ChunkOrder.h
2012-06-26 04:44:08 UTC (rev 48298)
+++ trunk/blender/source/blender/compositor/intern/COM_ChunkOrder.h
2012-06-26 07:09:49 UTC (rev 48299)
@@ -26,20 +26,20 @@
#include "COM_ChunkOrderHotspot.h"
class ChunkOrder {
private:
- unsigned int number;
- int x;
- int y;
- double distance;
+ unsigned int m_number;
+ int m_x;
+ int m_y;
+ double m_distance;
public:
ChunkOrder();
void determineDistance(ChunkOrderHotspot **hotspots, unsigned int
numberOfHotspots);
friend bool operator<(const ChunkOrder& a, const ChunkOrder& b);
- void setChunkNumber(unsigned int chunknumber) { this->number =
chunknumber; }
- void setX(int x) { this->x = x; }
- void setY(int y) { this->y = y; }
- unsigned int getChunkNumber() { return this->number; }
- double getDistance() { return this->distance; }
+ void setChunkNumber(unsigned int chunknumber) { this->m_number =
chunknumber; }
+ void setX(int x) { this->m_x = x; }
+ void setY(int y) { this->m_y = y; }
+ unsigned int getChunkNumber() { return this->m_number; }
+ double getDistance() { return this->m_distance; }
};
#endif
Modified:
trunk/blender/source/blender/compositor/intern/COM_ChunkOrderHotspot.cpp
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_ChunkOrderHotspot.cpp
2012-06-26 04:44:08 UTC (rev 48298)
+++ trunk/blender/source/blender/compositor/intern/COM_ChunkOrderHotspot.cpp
2012-06-26 07:09:49 UTC (rev 48299)
@@ -25,16 +25,16 @@
ChunkOrderHotspot::ChunkOrderHotspot(int x, int y, float addition)
{
- this->x = x;
- this->y = y;
- this->addition = addition;
+ this->m_x = x;
+ this->m_y = y;
+ this->m_addition = addition;
}
double ChunkOrderHotspot::determineDistance(int x, int y)
{
- int dx = x - this->x;
- int dy = y - this->y;
+ int dx = x - this->m_x;
+ int dy = y - this->m_y;
double result = sqrt((double)(dx * dx + dy * dy));
- result += (double)this->addition;
+ result += (double)this->m_addition;
return result;
}
Modified: trunk/blender/source/blender/compositor/intern/COM_ChunkOrderHotspot.h
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_ChunkOrderHotspot.h
2012-06-26 04:44:08 UTC (rev 48298)
+++ trunk/blender/source/blender/compositor/intern/COM_ChunkOrderHotspot.h
2012-06-26 07:09:49 UTC (rev 48299)
@@ -29,9 +29,9 @@
class ChunkOrderHotspot {
private:
- int x;
- int y;
- float addition;
+ int m_x;
+ int m_y;
+ float m_addition;
public:
ChunkOrderHotspot(int x, int y, float addition);
Modified:
trunk/blender/source/blender/compositor/intern/COM_CompositorContext.cpp
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_CompositorContext.cpp
2012-06-26 04:44:08 UTC (rev 48298)
+++ trunk/blender/source/blender/compositor/intern/COM_CompositorContext.cpp
2012-06-26 07:09:49 UTC (rev 48299)
@@ -26,16 +26,16 @@
CompositorContext::CompositorContext()
{
- this->rd = NULL;
- this->quality = COM_QUALITY_HIGH;
- this->hasActiveOpenCLDevices = false;
- this->activegNode = NULL;
+ this->m_rd = NULL;
+ this->m_quality = COM_QUALITY_HIGH;
+ this->m_hasActiveOpenCLDevices = false;
+ this->m_activegNode = NULL;
}
const int CompositorContext::getFramenumber() const
{
- if (this->rd) {
- return this->rd->cfra;
+ if (this->m_rd) {
+ return this->m_rd->cfra;
}
else {
return -1; /* this should never happen */
@@ -44,8 +44,8 @@
const int CompositorContext::isColorManaged() const
{
- if (this->rd) {
- return this->rd->color_mgt_flag & R_COLOR_MANAGEMENT;
+ if (this->m_rd) {
+ return this->m_rd->color_mgt_flag & R_COLOR_MANAGEMENT;
}
else {
return 0; /* this should never happen */
Modified: trunk/blender/source/blender/compositor/intern/COM_CompositorContext.h
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_CompositorContext.h
2012-06-26 04:44:08 UTC (rev 48298)
+++ trunk/blender/source/blender/compositor/intern/COM_CompositorContext.h
2012-06-26 07:09:49 UTC (rev 48299)
@@ -41,38 +41,38 @@
* This field is initialized in ExecutionSystem and must only be read
from that point on.
* @see ExecutionSystem
*/
- bool rendering;
+ bool m_rendering;
/**
* @brief The quality of the composite.
* This field is initialized in ExecutionSystem and must only be read
from that point on.
* @see ExecutionSystem
*/
- CompositorQuality quality;
+ CompositorQuality m_quality;
/**
* @brief Reference to the render data that is being composited.
* This field is initialized in ExecutionSystem and must only be read
from that point on.
* @see ExecutionSystem
*/
- RenderData *rd;
+ RenderData *m_rd;
/**
* @brief reference to the bNodeTree
* This field is initialized in ExecutionSystem and must only be read
from that point on.
* @see ExecutionSystem
*/
- bNodeTree *bnodetree;
+ bNodeTree *m_bnodetree;
/**
* @brief activegNode the group node that is currently being edited.
*/
- bNode *activegNode;
+ bNode *m_activegNode;
/**
* @brief does this system have active opencl devices?
*/
- bool hasActiveOpenCLDevices;
+ bool m_hasActiveOpenCLDevices;
public:
/**
@@ -83,56 +83,52 @@
/**
* @brief set the rendering field of the context
*/
- void setRendering(bool rendering) { this->rendering = rendering; }
+ void setRendering(bool rendering) { this->m_rendering = rendering; }
/**
* @brief get the rendering field of the context
*/
- bool isRendering() const { return this->rendering; }
+ bool isRendering() const { return this->m_rendering; }
/**
* @brief set the scene of the context
*/
- void setRenderData(RenderData *rd) { this->rd = rd; }
+ void setRenderData(RenderData *rd) { this->m_rd = rd; }
/**
* @brief set the bnodetree of the context
*/
- void setbNodeTree(bNodeTree *bnodetree) { this->bnodetree = bnodetree; }
+ void setbNodeTree(bNodeTree *bnodetree) { this->m_bnodetree =
bnodetree; }
/**
* @brief get the bnodetree of the context
*/
- const bNodeTree *getbNodeTree() const { return this->bnodetree; }
+ const bNodeTree *getbNodeTree() const { return this->m_bnodetree; }
/**
* @brief set the active groupnode of the context
*/
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
