From a9c8bf305becbf8a5168cb75c1de79f639465c75 Mon Sep 17 00:00:00 2001 From: Charles Wardlaw Date: Mon, 27 Nov 2023 21:08:17 +0100 Subject: [PATCH] Cleanup: USD: Fix unused declaration and argument Pull Request: https://projects.blender.org/blender/blender/pulls/115495 --- source/blender/io/usd/intern/usd_reader_material.cc | 4 +--- source/blender/io/usd/intern/usd_reader_material.h | 1 - source/blender/io/usd/intern/usd_writer_material.cc | 6 ------ 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/source/blender/io/usd/intern/usd_reader_material.cc b/source/blender/io/usd/intern/usd_reader_material.cc index 00dbf071952..2473a7730c5 100644 --- a/source/blender/io/usd/intern/usd_reader_material.cc +++ b/source/blender/io/usd/intern/usd_reader_material.cc @@ -734,8 +734,7 @@ bool USDMaterialReader::follow_connection(const pxr::UsdShadeInput &usd_input, source_shader, source_name, dest_node, dest_socket_name, ntree, column + 1, r_ctx); } else if (shader_id == usdtokens::UsdTransform2d) { - convert_usd_transform_2d( - source_shader, source_name, dest_node, dest_socket_name, ntree, column + 1, r_ctx); + convert_usd_transform_2d(source_shader, dest_node, dest_socket_name, ntree, column + 1, r_ctx); } return true; @@ -790,7 +789,6 @@ void USDMaterialReader::convert_usd_uv_texture(const pxr::UsdShadeShader &usd_sh } void USDMaterialReader::convert_usd_transform_2d(const pxr::UsdShadeShader &usd_shader, - const pxr::TfToken &usd_source_name, bNode *dest_node, const char *dest_socket_name, bNodeTree *ntree, diff --git a/source/blender/io/usd/intern/usd_reader_material.h b/source/blender/io/usd/intern/usd_reader_material.h index 089cd215215..7e43625db88 100644 --- a/source/blender/io/usd/intern/usd_reader_material.h +++ b/source/blender/io/usd/intern/usd_reader_material.h @@ -130,7 +130,6 @@ class USDMaterialReader { NodePlacementContext *r_ctx) const; void convert_usd_transform_2d(const pxr::UsdShadeShader &usd_shader, - const pxr::TfToken &usd_source_name, bNode *dest_node, const char *dest_socket_name, bNodeTree *ntree, diff --git a/source/blender/io/usd/intern/usd_writer_material.cc b/source/blender/io/usd/intern/usd_writer_material.cc index e35920d7ebd..cef2b70ceea 100644 --- a/source/blender/io/usd/intern/usd_writer_material.cc +++ b/source/blender/io/usd/intern/usd_writer_material.cc @@ -119,12 +119,6 @@ static void create_uv_input(const USDExporterContext &usd_export_context, pxr::UsdShadeInput &usd_input, const pxr::TfToken &default_uv, ReportList *reports); -static void create_uvmap_shader(const USDExporterContext &usd_export_context, - bNode *tex_node, - pxr::UsdShadeMaterial &usd_material, - pxr::UsdShadeShader &usd_tex_shader, - const pxr::TfToken &default_uv, - ReportList *reports); static void export_texture(const USDExporterContext &usd_export_context, bNode *node); static bNode *find_bsdf_node(Material *material); static void get_absolute_path(Image *ima, char *r_path);