griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: USD: Fix unused declaration and argument

Browse Source 
Pull Request: https://projects.blender.org/blender/blender/pulls/115495
This commit is contained in:
Charles Wardlaw
2023-11-27 21:08:17 +01:00
committed by Hans Goudey
parent 5e38f7faf0
commit a9c8bf305b
3 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/io/usd/intern/usd_reader_material.cc
View File

@@ -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,

1
source/blender/io/usd/intern/usd_reader_material.h
View File

@@ -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,

6
source/blender/io/usd/intern/usd_writer_material.cc
View File

@@ -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);