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:
authorHans Goudey <h.goudey@me.com>2022-02-04 03:27:42 +0300
committerHans Goudey <h.goudey@me.com>2022-02-04 03:27:42 +0300
commit28656293c624612a72224e0c7139471188c1203e (patch)
treef3a134566d3b78b5869811bd72d2f3beff34b490 /source/blender/io
parent3ddc39bec900bae1ffd6298807bd3f9f35ecf450 (diff)
Cleanup: Clang tidy, use braces
Braces missed in b73d3b80fdcb72446
Diffstat (limited to 'source/blender/io')
-rw-r--r--source/blender/io/usd/intern/usd_writer_material.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/io/usd/intern/usd_writer_material.cc b/source/blender/io/usd/intern/usd_writer_material.cc
index 52ad349fb98..5ce04339503 100644
--- a/source/blender/io/usd/intern/usd_writer_material.cc
+++ b/source/blender/io/usd/intern/usd_writer_material.cc
@@ -286,7 +286,7 @@ static void create_uvmap_shader(const USDExporterContext &usd_export_context,
}
bNode *uv_node = traverse_channel(tex_node_sock, SH_NODE_UVMAP);
- if (uv_node == NULL) {
+ if (uv_node == nullptr) {
continue;
}
@@ -391,7 +391,7 @@ static void export_in_memory_texture(Image *ima,
BKE_image_path_ensure_ext_from_imformat(file_name, &imageFormat);
char export_path[FILE_MAX];
- BLI_path_join(export_path, FILE_MAX, export_dir.c_str(), file_name, NULL);
+ BLI_path_join(export_path, FILE_MAX, export_dir.c_str(), file_name, nullptr);
if (!allow_overwrite && BLI_exists(export_path)) {
return;
@@ -590,7 +590,7 @@ static std::string get_tex_image_asset_path(bNode *node,
BLI_split_file_part(path.c_str(), file_path, FILE_MAX);
if (export_params.relative_texture_paths) {
- BLI_path_join(exp_path, FILE_MAX, ".", "textures", file_path, NULL);
+ BLI_path_join(exp_path, FILE_MAX, ".", "textures", file_path, nullptr);
}
else {
/* Create absolute path in the textures directory. */
@@ -602,7 +602,7 @@ static std::string get_tex_image_asset_path(bNode *node,
char dir_path[FILE_MAX];
BLI_split_dir_part(stage_path.c_str(), dir_path, FILE_MAX);
- BLI_path_join(exp_path, FILE_MAX, dir_path, "textures", file_path, NULL);
+ BLI_path_join(exp_path, FILE_MAX, dir_path, "textures", file_path, nullptr);
}
return exp_path;
}
@@ -697,7 +697,7 @@ static void copy_single_file(Image *ima, const std::string &dest_dir, const bool
BLI_split_file_part(source_path, file_name, FILE_MAX);
char dest_path[FILE_MAX];
- BLI_path_join(dest_path, FILE_MAX, dest_dir.c_str(), file_name, NULL);
+ BLI_path_join(dest_path, FILE_MAX, dest_dir.c_str(), file_name, nullptr);
if (!allow_overwrite && BLI_exists(dest_path)) {
return;
@@ -743,7 +743,7 @@ static void export_texture(bNode *node,
BLI_split_dir_part(stage_path.c_str(), usd_dir_path, FILE_MAX);
char tex_dir_path[FILE_MAX];
- BLI_path_join(tex_dir_path, FILE_MAX, usd_dir_path, "textures", SEP_STR, NULL);
+ BLI_path_join(tex_dir_path, FILE_MAX, usd_dir_path, "textures", SEP_STR, nullptr);
BLI_dir_create_recursive(tex_dir_path);