bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.2-release'

Browse Source
This commit is contained in:
Sergey Sharybin 2024-06-27 19:57:51 +02:00
commit d16eac9cee
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_files/build_environment/cmake/fribidi.cmake
View File

@ -12,7 +12,7 @@ ExternalProject_Add(external_fribidi
DOWNLOAD_DIR ${DOWNLOAD_DIR}
PREFIX ${BUILD_DIR}/fribidi
CONFIGURE_COMMAND
CONFIGURE_COMMAND ${CONFIGURE_ENV} &&
${MESON} setup
--prefix ${LIBDIR}/fribidi
${MESON_BUILD_TYPE}

2
lib/windows_arm64

@ -1 +1 @@
Subproject commit 06a9cd56a271b0d44a600858aedc8e32d18229a9
Subproject commit 181d15c1c640d826c593b54ce097894a1710977e

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

@ -12,6 +12,8 @@
#include <pxr/base/gf/rotation.h>
#include <pxr/base/gf/vec3f.h>
#include <pxr/usd/ar/packageUtils.h>
#include <pxr/usd/usdGeom/metrics.h>
#include <pxr/usd/usdGeom/tokens.h>
#include <pxr/usd/usdGeom/xformCache.h>
#include <pxr/usd/usdGeom/xformCommonAPI.h>
#include <pxr/usd/usdLux/domeLight.h>
@ -533,6 +535,19 @@ void dome_light_to_world_material(const USDImportParams &params,
pxr::UsdGeomXformCache xf_cache(motionSampleTime);
pxr::GfMatrix4d xf = xf_cache.GetLocalToWorldTransform(dome_light.GetPrim());
pxr::UsdStageRefPtr stage = dome_light.GetPrim().GetStage();
if (!stage) {
CLOG_WARN(
&LOG, "Couldn't get stage for dome light %s", dome_light.GetPrim().GetPath().GetText());
return;
}
if (pxr::UsdGeomGetStageUpAxis(stage) == pxr::UsdGeomTokens->y) {
/* Convert from Y-up to Z-up with a 90 degree rotation about the X-axis. */
xf *= pxr::GfMatrix4d().SetRotate(pxr::GfRotation(pxr::GfVec3d(1.0, 0.0, 0.0), 90.0));
}
xf = pxr::GfMatrix4d().SetRotate(pxr::GfRotation(pxr::GfVec3d(0.0, 0.0, 1.0), -90.0)) *
pxr::GfMatrix4d().SetRotate(pxr::GfRotation(pxr::GfVec3d(1.0, 0.0, 0.0), -90.0)) * xf;