[Bf-blender-cvs] [0a00795c8a8] temp-gpencil-io: Use nullptr instead of NULL
Antonio Vazquez
noreply at git.blender.org
Wed Mar 24 14:55:34 CET 2021
Commit: 0a00795c8a89af09036093e1c6adf404860a2146
Author: Antonio Vazquez
Date: Wed Mar 24 14:47:09 2021 +0100
Branches: temp-gpencil-io
https://developer.blender.org/rB0a00795c8a89af09036093e1c6adf404860a2146
Use nullptr instead of NULL
===================================================================
M source/blender/io/gpencil/intern/gpencil_io_base.cc
===================================================================
diff --git a/source/blender/io/gpencil/intern/gpencil_io_base.cc b/source/blender/io/gpencil/intern/gpencil_io_base.cc
index 6250d92ae77..855252e648c 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_base.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_base.cc
@@ -65,12 +65,12 @@ GpencilIO::GpencilIO(const GpencilIOParams *iparams)
depsgraph_ = CTX_data_depsgraph_pointer(params_.C);
scene_ = CTX_data_scene(params_.C);
rv3d_ = (RegionView3D *)params_.region->regiondata;
- gpd_ = (params_.ob != NULL) ? (bGPdata *)params_.ob->data : nullptr;
+ gpd_ = (params_.ob != nullptr) ? (bGPdata *)params_.ob->data : nullptr;
cfra_ = iparams->frame_cur;
/* Calculate camera matrix. */
Object *cam_ob = params_.v3d->camera;
- if (cam_ob != NULL) {
+ if (cam_ob != nullptr) {
/* Set up parameters. */
CameraParams params;
BKE_camera_params_init(¶ms);
More information about the Bf-blender-cvs
mailing list