blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

USD import: fix light intensity scaling. 

Updated light intensity calculations on import
to preserve values on round trip Blender ->
USD -> Blender.
This commit is contained in:
Michael Kowalski 2022-06-14 23:56:43 -04:00
parent 9d39948871
commit 1d5d49775c
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/io/usd/intern/usd_reader_light.cc
View File

@ -279,6 +279,11 @@ void USDLightReader::read_object_data(Main *bmain, const double motionSampleTime
break;
}
const float meters_per_unit = static_cast<float>(
pxr::UsdGeomGetStageMetersPerUnit(prim_.GetStage()));
const float radius_scale = meters_per_unit * usd_world_scale_;
float intensity;
if (get_authored_value(light_api.GetIntensityAttr(), motionSampleTime, &intensity) ||
prim_.GetAttribute(usdtokens::intensity).Get(&intensity, motionSampleTime)) {
@ -286,18 +291,14 @@ void USDLightReader::read_object_data(Main *bmain, const double motionSampleTime
float intensity_scale = this->import_params_.light_intensity_scale;
if (import_params_.convert_light_from_nits) {
/* It's important that we perform the light unit conversion before applying any scaling to
* the light size, so we can use the USD's meters per unit value. */
const float meters_per_unit = static_cast<float>(
pxr::UsdGeomGetStageMetersPerUnit(prim_.GetStage()));
intensity_scale *= nits_to_energy_scale_factor(blight, meters_per_unit * usd_world_scale_);
intensity_scale *= nits_to_energy_scale_factor(blight, radius_scale);
}
blight->energy = intensity * intensity_scale;
}
if ((blight->type == LA_SPOT || blight->type == LA_LOCAL) && import_params_.scale_light_radius) {
blight->area_size *= settings_->scale;
blight->area_size *= radius_scale;
}
USDXformReader::read_object_data(bmain, motionSampleTime);

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

@ -77,7 +77,7 @@ USDPrimReader *USDStageReader::create_reader_if_allowed(const pxr::UsdPrim &prim
#else
if (params_.import_lights && prim.IsA<pxr::UsdLuxLight>()) {
#endif
return new USDLightReader(prim, params_, settings_);
return new USDLightReader(prim, params_, settings_, xf_cache);
}
if (params_.import_volumes && prim.IsA<pxr::UsdVolVolume>()) {
return new USDVolumeReader(prim, params_, settings_);
@ -116,7 +116,7 @@ USDPrimReader *USDStageReader::create_reader(const pxr::UsdPrim &prim,
#else
if (prim.IsA<pxr::UsdLuxLight>()) {
#endif
return new USDLightReader(prim, params_, settings_);
return new USDLightReader(prim, params_, settings_, xf_cache);
}
if (prim.IsA<pxr::UsdVolVolume>()) {
return new USDVolumeReader(prim, params_, settings_);