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:
authorCampbell Barton <ideasman42@gmail.com>2021-06-18 07:27:43 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-06-18 07:41:24 +0300
commitaf4167441bc37707c1ed32ded348bc0865f9c093 (patch)
tree586d24617fe21cc8b6257851e5176ba664d6ccdb /source/blender/nodes
parent50a4b9d502104aabdd33ed924a89fe018cfa80b3 (diff)
Cleanup: clang-tidy
Diffstat (limited to 'source/blender/nodes')
-rw-r--r--source/blender/nodes/geometry/nodes/node_geo_raycast.cc2
-rw-r--r--source/blender/nodes/shader/nodes/node_shader_mixRgb.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/nodes/geometry/nodes/node_geo_raycast.cc b/source/blender/nodes/geometry/nodes/node_geo_raycast.cc
index 3a4492d24d6..bfd6027e0fc 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_raycast.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_raycast.cc
@@ -97,7 +97,7 @@ static void raycast_to_mesh(const Mesh *mesh,
BVHTreeFromMesh tree_data;
BKE_bvhtree_from_mesh_get(&tree_data, const_cast<Mesh *>(mesh), BVHTREE_FROM_LOOPTRI, 4);
- if (tree_data.tree != NULL) {
+ if (tree_data.tree != nullptr) {
for (const int i : ray_origins.index_range()) {
const float ray_length = ray_lengths[i];
const float3 ray_origin = ray_origins[i];
diff --git a/source/blender/nodes/shader/nodes/node_shader_mixRgb.cc b/source/blender/nodes/shader/nodes/node_shader_mixRgb.cc
index 52f2adb10dd..6baaa17f956 100644
--- a/source/blender/nodes/shader/nodes/node_shader_mixRgb.cc
+++ b/source/blender/nodes/shader/nodes/node_shader_mixRgb.cc
@@ -134,7 +134,7 @@ void register_node_type_sh_mix_rgb(void)
sh_node_type_base(&ntype, SH_NODE_MIX_RGB, "Mix", NODE_CLASS_OP_COLOR, 0);
node_type_socket_templates(&ntype, sh_node_mix_rgb_in, sh_node_mix_rgb_out);
node_type_label(&ntype, node_blend_label);
- node_type_exec(&ntype, NULL, NULL, node_shader_exec_mix_rgb);
+ node_type_exec(&ntype, nullptr, nullptr, node_shader_exec_mix_rgb);
node_type_gpu(&ntype, gpu_shader_mix_rgb);
nodeRegisterType(&ntype);