blender/blender
149
474
Fork 696
Code Issues 6.7k Pull Requests 888 Projects 18 Wiki Activity

Fix: USD Export: When the World material has no texture input, export the color as a solid image so that Hydra doesn't choke. #123933

Merged
Jesse Yurkovich merged 2 commits from CharlesWardlaw/blender:bugfix/dome_export_solid into blender-v4.2-release 2024-06-30 21:06:25 +02:00
Conversation 1 Commits 2 Files Changed 1 +35
1 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
source/blender/io/usd/intern/usd_light_convert.cc
View File

@ -26,10 +26,14 @@
#include "BLI_fileops.h"
#include "BLI_listbase.h"
#include "BLI_math_vector.h"
#include "BLI_path_util.h"
#include "BLI_string.h"
#include "DNA_node_types.h"
#include "DNA_scene_types.h"
#include "DNA_world_types.h"
#include "../hydra/image.hh"
#include <string>
#include "CLG_log.h"
@ -297,6 +301,37 @@ void world_material_to_dome_light(const USDExportParams &params,
pxr::UsdLuxDomeLight dome_light = pxr::UsdLuxDomeLight::Define(stage, env_light_path);
if (!res.env_tex_found) {
/* Like the Hydra delegate, if no texture is found export a solid
* color texture as a stand-in so that Hydra renderers don't
* throw errors. */
float fill_color[4] = {res.world_color[0], res.world_color[1], res.world_color[2], 1.0f};
std::string source_path = blender::io::hydra::cache_image_color(fill_color);
const std::string base_path = stage->GetRootLayer()->GetRealPath();
/* It'll be short, coming from cache_image_color. */
char file_path[64];
BLI_path_split_file_part(source_path.c_str(), file_path, 64);
char dest_path[FILE_MAX];
BLI_path_split_dir_part(base_path.c_str(), dest_path, FILE_MAX);
BLI_path_append_dir(dest_path, FILE_MAX, "textures");
BLI_dir_create_recursive(dest_path);
CharlesWardlaw marked this conversation as resolved Outdated
Jesse Yurkovich commented 2024-06-29 03:05:10 +02:00
Outdated
Review
Copy Link

Looks like we need a BLI_dir_create_recursive before the copy since this "textures" directory doesn't exist. So something like:

    BLI_path_append_dir(dest_path, FILE_MAX, "textures");
    BLI_dir_create_recursive(dest_path);

    BLI_path_append(dest_path, FILE_MAX, file_path);
    if (BLI_copy(source_path.c_str(), dest_path) != 0) {
...
Looks like we need a `BLI_dir_create_recursive` before the copy since this "textures" directory doesn't exist. So something like: ```cpp BLI_path_append_dir(dest_path, FILE_MAX, "textures"); BLI_dir_create_recursive(dest_path); BLI_path_append(dest_path, FILE_MAX, file_path); if (BLI_copy(source_path.c_str(), dest_path) != 0) { ... ```
BLI_path_append(dest_path, FILE_MAX, file_path);
if (BLI_copy(source_path.c_str(), dest_path) != 0) {
CLOG_WARN(&LOG, "USD Export: Couldn't write world color image to %s", dest_path);
}
else {
res.env_tex_found = true;
BLI_path_join(dest_path, FILE_MAX, ".", "textures", file_path);
res.file_path = dest_path;
}
}
if (res.env_tex_found) {
pxr::SdfAssetPath path(res.file_path);
dome_light.CreateTextureFileAttr().Set(path);