DagerD/blender
1
1
Fork 0
forked from blender/blender
Code Pull Requests Activity

MaterialX: fix review comments #19

Merged
Bogdan Nagirniak merged 10 commits from matx-fix-review-comments into matx-export-material 2023-09-14 02:01:04 +02:00
Conversation 0 Commits 10 Files Changed 34 +2 -3
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c9ae63a427 - Show all commits

5
source/blender/io/usd/hydra/material.cc
View File

@ -13,8 +13,8 @@
#include <pxr/usdImaging/usdImaging/materialParamUtils.h> #include <pxr/usdImaging/usdImaging/materialParamUtils.h>
#ifdef WITH_MATERIALX #ifdef WITH_MATERIALX
#include <pxr/usd/usdMtlx/reader.h> # include <pxr/usd/usdMtlx/reader.h>
#include <pxr/usd/usdMtlx/utils.h> # include <pxr/usd/usdMtlx/utils.h>
#endif #endif
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
@ -94,7 +94,6 @@ void MaterialData::init()
} }
#endif #endif
BogdanNagirniak marked this conversation as resolved
Bogdan Nagirniak commented 2023-09-13 15:44:06 +02:00
Review
Copy Link

simplify to:

....
  else
#endif
{
usd_material = usd::create_usd_material(export_context, material_path, (Material *)id, "st");
}
simplify to: ``` .... else #endif { usd_material = usd::create_usd_material(export_context, material_path, (Material *)id, "st"); } ```
/* Convert USD material to Hydra material network map, adapted for render delegate. */ /* Convert USD material to Hydra material network map, adapted for render delegate. */
const pxr::HdRenderDelegate *render_delegate = const pxr::HdRenderDelegate *render_delegate =
scene_delegate_->GetRenderIndex().GetRenderDelegate(); scene_delegate_->GetRenderIndex().GetRenderDelegate();