[Bf-blender-cvs] [2654c523c17] master: Cleanup: use nullptr in C++
Jacques Lucke
noreply at git.blender.org
Sat Nov 19 11:52:05 CET 2022
Commit: 2654c523c1718ff3d546078551702b243e03738a
Author: Jacques Lucke
Date: Sat Nov 19 11:51:42 2022 +0100
Branches: master
https://developer.blender.org/rB2654c523c1718ff3d546078551702b243e03738a
Cleanup: use nullptr in C++
===================================================================
M source/blender/blendthumb/src/blendthumb_win32.cc
M source/blender/blenkernel/intern/layer.cc
M source/blender/blenkernel/intern/mesh_remap.cc
M source/blender/blenlib/tests/BLI_memiter_test.cc
M source/blender/blenlib/tests/BLI_path_util_test.cc
M source/blender/blenloader/intern/versioning_defaults.cc
M source/blender/bmesh/intern/bmesh_iterators.cc
M source/blender/draw/engines/workbench/workbench_materials.cc
M source/blender/draw/intern/draw_cache_impl_gpencil.cc
M source/blender/editors/curves/intern/curves_ops.cc
M source/blender/editors/mesh/meshtools.cc
M source/blender/editors/space_outliner/outliner_draw.cc
M source/blender/editors/space_outliner/outliner_edit.cc
M source/blender/editors/transform/transform_convert_node.cc
M source/blender/editors/uvedit/uvedit_clipboard.cc
M source/blender/gpu/intern/gpu_node_graph.cc
M source/blender/gpu/intern/gpu_texture.cc
M source/blender/io/alembic/exporter/abc_writer_hair.cc
M source/blender/nodes/intern/node_util.cc
M source/blender/nodes/texture/node_texture_tree.cc
M source/blender/nodes/texture/nodes/node_texture_common.cc
M source/blender/nodes/texture/nodes/node_texture_coord.cc
M source/blender/nodes/texture/nodes/node_texture_curves.cc
M source/blender/nodes/texture/nodes/node_texture_image.cc
M source/blender/nodes/texture/nodes/node_texture_output.cc
M source/blender/nodes/texture/nodes/node_texture_proc.cc
M source/blender/nodes/texture/nodes/node_texture_texture.cc
M source/blender/nodes/texture/nodes/node_texture_viewer.cc
===================================================================
diff --git a/source/blender/blendthumb/src/blendthumb_win32.cc b/source/blender/blendthumb/src/blendthumb_win32.cc
index 206309b6caf..9edcd618168 100644
--- a/source/blender/blendthumb/src/blendthumb_win32.cc
+++ b/source/blender/blendthumb/src/blendthumb_win32.cc
@@ -26,7 +26,7 @@
*/
class CBlendThumb : public IInitializeWithStream, public IThumbnailProvider {
public:
- CBlendThumb() : _cRef(1), _pStream(NULL)
+ CBlendThumb() : _cRef(1), _pStream(nullptr)
{
}
@@ -85,7 +85,7 @@ HRESULT CBlendThumb_CreateInstance(REFIID riid, void **ppv)
IFACEMETHODIMP CBlendThumb::Initialize(IStream *pStream, DWORD)
{
- if (_pStream != NULL) {
+ if (_pStream != nullptr) {
/* Can only be initialized once. */
return E_UNEXPECTED;
}
@@ -179,7 +179,7 @@ IFACEMETHODIMP CBlendThumb::GetThumbnail(UINT cx, HBITMAP *phbmp, WTS_ALPHATYPE
IWICImagingFactory *pImgFac;
hr = CoCreateInstance(
- CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&pImgFac));
+ CLSID_WICImagingFactory, nullptr, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&pImgFac));
IWICBitmap *WICBmp;
hr = pImgFac->CreateBitmapFromHBITMAP(*phbmp, 0, WICBitmapUseAlpha, &WICBmp);
@@ -193,7 +193,8 @@ IFACEMETHODIMP CBlendThumb::GetThumbnail(UINT cx, HBITMAP *phbmp, WTS_ALPHATYPE
bmi.bmiHeader.biCompression = BI_RGB;
BYTE *pBits;
- HBITMAP ResizedHBmp = CreateDIBSection(NULL, &bmi, DIB_RGB_COLORS, (void **)&pBits, NULL, 0);
+ HBITMAP ResizedHBmp = CreateDIBSection(
+ nullptr, &bmi, DIB_RGB_COLORS, (void **)&pBits, nullptr, 0);
hr = ResizedHBmp ? S_OK : E_OUTOFMEMORY;
if (SUCCEEDED(hr)) {
IWICBitmapScaler *pIScaler;
diff --git a/source/blender/blenkernel/intern/layer.cc b/source/blender/blenkernel/intern/layer.cc
index 47a6d6f7bd4..4dfe507e02e 100644
--- a/source/blender/blenkernel/intern/layer.cc
+++ b/source/blender/blenkernel/intern/layer.cc
@@ -82,7 +82,7 @@ static LayerCollection *layer_collection_add(ListBase *lb_parent, Collection *co
static void layer_collection_free(ViewLayer *view_layer, LayerCollection *lc)
{
if (lc == view_layer->active_collection) {
- view_layer->active_collection = NULL;
+ view_layer->active_collection = nullptr;
}
LISTBASE_FOREACH (LayerCollection *, nlc, &lc->layer_collections) {
@@ -143,7 +143,7 @@ ViewLayer *BKE_view_layer_find(const Scene *scene, const char *layer_name)
}
}
- return NULL;
+ return nullptr;
}
ViewLayer *BKE_view_layer_context_active_PLACEHOLDER(const Scene *scene)
@@ -178,7 +178,7 @@ static void layer_collection_exclude_all(LayerCollection *layer_collection)
{
LayerCollection *sub_collection = static_cast<LayerCollection *>(
layer_collection->layer_collections.first);
- for (; sub_collection != NULL; sub_collection = sub_collection->next) {
+ for (; sub_collection != nullptr; sub_collection = sub_collection->next) {
sub_collection->flag |= LAYER_COLLECTION_EXCLUDE;
layer_collection_exclude_all(sub_collection);
}
@@ -246,12 +246,12 @@ void BKE_view_layer_free(ViewLayer *view_layer)
void BKE_view_layer_free_ex(ViewLayer *view_layer, const bool do_id_user)
{
- view_layer->basact = NULL;
+ view_layer->basact = nullptr;
BLI_freelistN(&view_layer->object_bases);
if (view_layer->object_bases_hash) {
- BLI_ghash_free(view_layer->object_bases_hash, NULL, NULL);
+ BLI_ghash_free(view_layer->object_bases_hash, nullptr, nullptr);
}
LISTBASE_FOREACH (LayerCollection *, lc, &view_layer->layer_collections) {
@@ -269,9 +269,9 @@ void BKE_view_layer_free_ex(ViewLayer *view_layer, const bool do_id_user)
}
BLI_freelistN(&view_layer->drawdata);
BLI_freelistN(&view_layer->aovs);
- view_layer->active_aov = NULL;
+ view_layer->active_aov = nullptr;
BLI_freelistN(&view_layer->lightgroups);
- view_layer->active_lightgroup = NULL;
+ view_layer->active_lightgroup = nullptr;
MEM_SAFE_FREE(view_layer->stats);
@@ -321,7 +321,7 @@ Object *BKE_view_layer_camera_find(const Scene *scene, ViewLayer *view_layer)
}
}
- return NULL;
+ return nullptr;
}
ViewLayer *BKE_view_layer_find_from_collection(const Scene *scene, LayerCollection *lc)
@@ -332,7 +332,7 @@ ViewLayer *BKE_view_layer_find_from_collection(const Scene *scene, LayerCollecti
}
}
- return NULL;
+ return nullptr;
}
/* Base */
@@ -341,10 +341,10 @@ static void view_layer_bases_hash_create(ViewLayer *view_layer, const bool do_ba
{
static ThreadMutex hash_lock = BLI_MUTEX_INITIALIZER;
- if (view_layer->object_bases_hash == NULL) {
+ if (view_layer->object_bases_hash == nullptr) {
BLI_mutex_lock(&hash_lock);
- if (view_layer->object_bases_hash == NULL) {
+ if (view_layer->object_bases_hash == nullptr) {
GHash *hash = BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp, __func__);
LISTBASE_FOREACH_MUTABLE (Base *, base, &view_layer->object_bases) {
@@ -361,7 +361,7 @@ static void view_layer_bases_hash_create(ViewLayer *view_layer, const bool do_ba
* tackle it here. */
else if (do_base_duplicates_fix) {
if (view_layer->basact == base) {
- view_layer->basact = NULL;
+ view_layer->basact = nullptr;
}
BLI_freelinkN(&view_layer->object_bases, base);
}
@@ -419,14 +419,14 @@ static void layer_aov_copy_data(ViewLayer *view_layer_dst,
ListBase *aovs_dst,
const ListBase *aovs_src)
{
- if (aovs_src != NULL) {
+ if (aovs_src != nullptr) {
BLI_duplicatelist(aovs_dst, aovs_src);
}
ViewLayerAOV *aov_dst = static_cast<ViewLayerAOV *>(aovs_dst->first);
const ViewLayerAOV *aov_src = static_cast<const ViewLayerAOV *>(aovs_src->first);
- while (aov_dst != NULL) {
+ while (aov_dst != nullptr) {
BLI_assert(aov_src);
if (aov_src == view_layer_src->active_aov) {
view_layer_dst->active_aov = aov_dst;
@@ -442,7 +442,7 @@ static void layer_lightgroup_copy_data(ViewLayer *view_layer_dst,
ListBase *lightgroups_dst,
const ListBase *lightgroups_src)
{
- if (lightgroups_src != NULL) {
+ if (lightgroups_src != nullptr) {
BLI_duplicatelist(lightgroups_dst, lightgroups_src);
}
@@ -450,7 +450,7 @@ static void layer_lightgroup_copy_data(ViewLayer *view_layer_dst,
const ViewLayerLightgroup *lightgroup_src = static_cast<const ViewLayerLightgroup *>(
lightgroups_src->first);
- while (lightgroup_dst != NULL) {
+ while (lightgroup_dst != nullptr) {
BLI_assert(lightgroup_src);
if (lightgroup_src == view_layer_src->active_lightgroup) {
view_layer_dst->active_lightgroup = lightgroup_dst;
@@ -473,7 +473,7 @@ static void layer_collections_copy_data(ViewLayer *view_layer_dst,
const LayerCollection *layer_collection_src = static_cast<const LayerCollection *>(
layer_collections_src->first);
- while (layer_collection_dst != NULL) {
+ while (layer_collection_dst != nullptr) {
layer_collections_copy_data(view_layer_dst,
view_layer_src,
&layer_collection_dst->layer_collections,
@@ -494,18 +494,18 @@ void BKE_view_layer_copy_data(Scene *scene_dst,
const ViewLayer *view_layer_src,
const int flag)
{
- if (view_layer_dst->id_properties != NULL) {
+ if (view_layer_dst->id_properties != nullptr) {
view_layer_dst->id_properties = IDP_CopyProperty_ex(view_layer_dst->id_properties, flag);
}
BKE_freestyle_config_copy(
&view_layer_dst->freestyle_config, &view_layer_src->freestyle_config, flag);
- view_layer_dst->stats = NULL;
+ view_layer_dst->stats = nullptr;
/* Clear temporary data. */
BLI_listbase_clear(&view_layer_dst->drawdata);
- view_layer_dst->object_bases_array = NULL;
- view_layer_dst->object_bases_hash = NULL;
+ view_layer_dst->object_bases_array = nullptr;
+ view_layer_dst->object_bases_hash = nullptr;
/* Copy layer collections and object bases. */
/* Inline 'BLI_duplicatelist' and update the active base. */
@@ -520,7 +520,7 @@ void BKE_view_layer_copy_data(Scene *scene_dst,
}
}
- view_layer_dst->active_collection = NULL;
+ view_layer_dst->active_collection = nullptr;
layer_collections_copy_data(view_layer_dst,
view_layer_src,
&view_layer_dst->layer_collections,
@@ -562,7 +562,7 @@ void BKE_view_layer_rename(Main *bmain, Scene *scene, ViewLayer *view_layer, con
int index = BLI_findindex(&scene->view_layers, view_layer);
for (node = static_cast<bNode *>(scene->nodetree->nodes.first); node; node = node->next) {
- if (node->type == CMP_NODE_R_LAYERS && node->id == NULL) {
+ if (node->type == CMP_NODE_R_LAYERS && node->id == nullptr) {
if (node->custom1 == index) {
BLI_strncpy(node->name, view_layer->name, NODE_MAXSTR);
}
@@ -571,7 +571,7 @@ void BKE_view_layer_rename(Main *bmain, Scene *scene, ViewLayer *view_layer, con
}
/* Fix all the animation data and windows which may link to this. */
- BKE_animdata_fix_paths_rename_all(NULL, "view_layers", oldname, view_layer->name);
+ BKE_animdata_fix_paths_rename_all(nullptr, "view_layers", oldname, view_layer->name);
/* WM can be missing on startup. */
wmWindowManager *wm = static_cast<wmWindowManager *>(bmain->wm.first);
@@ -608,7 +608,7 @@ static LayerCollection *collection_from_index(ListBase *lb, const int number, in
return lc_nested;
}
}
- return NULL;
+ return nullptr;
}
/**
@@ -668,7 +668,7 @@ LayerCollection *BKE_layer_collection_activate_parent(ViewLayer *view_layer, Lay
lc = BKE_layer_collection_first_from_scene_collection(view_layer, parent->collection);
}
else {
- lc = NULL;
+ lc = nullptr;
}
/* Don't activate excluded or hidden collections to prevent creating objects in a hidden
@@ -820,19 +820,19 @@ static LayerCollectionResync *layer_collection_resync_create_recurse(
layer_resync->layer = layer;
layer_resync->collection = layer->collec
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list