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

Merge branch 'blender-v4.1-release'

Browse Source
This commit is contained in:
Jesse Yurkovich
2024-03-08 14:26:03 -08:00
parent 2e8e2be0af 88b335aa0f
commit 7ba8087ac8
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,6 +72,7 @@ static const pxr::TfToken RAW("RAW", pxr::TfToken::Immortal);
static const pxr::TfToken black("black", pxr::TfToken::Immortal);
static const pxr::TfToken clamp("clamp", pxr::TfToken::Immortal);
static const pxr::TfToken repeat("repeat", pxr::TfToken::Immortal);
static const pxr::TfToken mirror("mirror", pxr::TfToken::Immortal);
static const pxr::TfToken wrapS("wrapS", pxr::TfToken::Immortal);
static const pxr::TfToken wrapT("wrapT", pxr::TfToken::Immortal);
@@ -330,6 +331,10 @@ static int get_image_extension(const pxr::UsdShadeShader &usd_shader, const int
return SHD_IMAGE_EXTENSION_CLIP;
}
if (wrap_val == usdtokens::mirror) {
return SHD_IMAGE_EXTENSION_MIRROR;
}
return default_value;
}

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

@@ -77,6 +77,7 @@ static const pxr::TfToken Shader("Shader", pxr::TfToken::Immortal);
static const pxr::TfToken black("black", pxr::TfToken::Immortal);
static const pxr::TfToken clamp("clamp", pxr::TfToken::Immortal);
static const pxr::TfToken repeat("repeat", pxr::TfToken::Immortal);
static const pxr::TfToken mirror("mirror", pxr::TfToken::Immortal);
static const pxr::TfToken wrapS("wrapS", pxr::TfToken::Immortal);
static const pxr::TfToken wrapT("wrapT", pxr::TfToken::Immortal);
static const pxr::TfToken in("in", pxr::TfToken::Immortal);
@@ -694,6 +695,9 @@ static pxr::TfToken get_node_tex_image_wrap(bNode *node)
case SHD_IMAGE_EXTENSION_CLIP:
wrap = usdtokens::black;
break;
case SHD_IMAGE_EXTENSION_MIRROR:
wrap = usdtokens::mirror;
break;
}
return wrap;