blender
/
blender
136
406
Fork 589
Code Issues 6.3k Pull Requests 766 Projects 19 Wiki Activity

Cleanup: NULL -> nullptr.

This commit is contained in:
Jeroen Bakker 2021-03-16 15:08:23 +01:00
parent 93e2491ee7
commit 4ce5dfe54c
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/compositor/intern/COM_SingleThreadedOperation.h
View File

@ -27,7 +27,7 @@ class SingleThreadedOperation : public NodeOperation {
protected:
inline bool isCached()
{
return this->m_cachedInstance != NULL;
return this->m_cachedInstance != nullptr;
}
public:

2
source/blender/compositor/operations/COM_DespeckleOperation.cc
View File

@ -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

10
source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cc
View File

@ -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],