Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Bakker <jeroen@blender.org>2021-03-16 17:08:23 +0300
committerJeroen Bakker <jeroen@blender.org>2021-03-16 17:08:23 +0300
commit4ce5dfe54c380176032d6d70f3b563f6d6d61f5f (patch)
tree1ec9fa46d727aa68d354b4ef1e9458796335a08a
parent93e2491ee724874a28030ae4d32f39bed6835923 (diff)
Cleanup: NULL -> nullptr.
-rw-r--r--source/blender/compositor/intern/COM_SingleThreadedOperation.h2
-rw-r--r--source/blender/compositor/operations/COM_DespeckleOperation.cc2
-rw-r--r--source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cc10
3 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/compositor/intern/COM_SingleThreadedOperation.h b/source/blender/compositor/intern/COM_SingleThreadedOperation.h
index 31597c31bf7..32f4515cf2a 100644
--- a/source/blender/compositor/intern/COM_SingleThreadedOperation.h
+++ b/source/blender/compositor/intern/COM_SingleThreadedOperation.h
@@ -27,7 +27,7 @@ class SingleThreadedOperation : public NodeOperation {
protected:
inline bool isCached()
{
- return this->m_cachedInstance != NULL;
+ return this->m_cachedInstance != nullptr;
}
public:
diff --git a/source/blender/compositor/operations/COM_DespeckleOperation.cc b/source/blender/compositor/operations/COM_DespeckleOperation.cc
index 901445c6875..b299c73eabb 100644
--- a/source/blender/compositor/operations/COM_DespeckleOperation.cc
+++ b/source/blender/compositor/operations/COM_DespeckleOperation.cc
@@ -101,7 +101,7 @@ void DespeckleOperation::executePixel(float output[4], int x, int y, void * /*da
COLOR_ADD(TOT_DIV_ONE)
#if 0
- this->m_inputOperation->read(in2, x2, y2, NULL);
+ this->m_inputOperation->read(in2, x2, y2, nullptr);
madd_v4_v4fl(color_mid, in2, this->m_filter[4]);
#endif
diff --git a/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cc b/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cc
index 909a2f73d25..b96c713a83a 100644
--- a/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cc
+++ b/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cc
@@ -42,7 +42,7 @@ VariableSizeBokehBlurOperation::VariableSizeBokehBlurOperation()
this->m_threshold = 1.0f;
this->m_do_size_scale = false;
#ifdef COM_DEFOCUS_SEARCH
- this->m_inputSearchProgram = NULL;
+ this->m_inputSearchProgram = nullptr;
#endif
}
@@ -114,7 +114,7 @@ void VariableSizeBokehBlurOperation::executePixel(float output[4], int x, int y,
this->m_inputSearchProgram->read(search,
x / InverseSearchRadiusOperation::DIVIDER,
y / InverseSearchRadiusOperation::DIVIDER,
- NULL);
+ nullptr);
int minx = search[0];
int miny = search[1];
int maxx = search[2];
@@ -225,7 +225,7 @@ void VariableSizeBokehBlurOperation::deinitExecution()
this->m_inputBokehProgram = nullptr;
this->m_inputSizeProgram = nullptr;
#ifdef COM_DEFOCUS_SEARCH
- this->m_inputSearchProgram = NULL;
+ this->m_inputSearchProgram = nullptr;
#endif
}
@@ -281,7 +281,7 @@ InverseSearchRadiusOperation::InverseSearchRadiusOperation()
this->addInputSocket(COM_DT_VALUE, COM_SC_NO_RESIZE); // radius
this->addOutputSocket(COM_DT_COLOR);
this->setComplex(true);
- this->m_inputRadius = NULL;
+ this->m_inputRadius = nullptr;
}
void InverseSearchRadiusOperation::initExecution()
@@ -359,7 +359,7 @@ void InverseSearchRadiusOperation::deinitializeTileData(rcti *rect, void *data)
void InverseSearchRadiusOperation::deinitExecution()
{
- this->m_inputRadius = NULL;
+ this->m_inputRadius = nullptr;
}
void InverseSearchRadiusOperation::determineResolution(unsigned int resolution[2],