Merge branch 'blender-v4.2-release'
This commit is contained in:
commit
d16eac9cee
@ -12,7 +12,7 @@ ExternalProject_Add(external_fribidi
|
|||||||
DOWNLOAD_DIR ${DOWNLOAD_DIR}
|
DOWNLOAD_DIR ${DOWNLOAD_DIR}
|
||||||
PREFIX ${BUILD_DIR}/fribidi
|
PREFIX ${BUILD_DIR}/fribidi
|
||||||
|
|
||||||
CONFIGURE_COMMAND
|
CONFIGURE_COMMAND ${CONFIGURE_ENV} &&
|
||||||
${MESON} setup
|
${MESON} setup
|
||||||
--prefix ${LIBDIR}/fribidi
|
--prefix ${LIBDIR}/fribidi
|
||||||
${MESON_BUILD_TYPE}
|
${MESON_BUILD_TYPE}
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit 06a9cd56a271b0d44a600858aedc8e32d18229a9
|
Subproject commit 181d15c1c640d826c593b54ce097894a1710977e
|
@ -12,6 +12,8 @@
|
|||||||
#include <pxr/base/gf/rotation.h>
|
#include <pxr/base/gf/rotation.h>
|
||||||
#include <pxr/base/gf/vec3f.h>
|
#include <pxr/base/gf/vec3f.h>
|
||||||
#include <pxr/usd/ar/packageUtils.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/xformCache.h>
|
||||||
#include <pxr/usd/usdGeom/xformCommonAPI.h>
|
#include <pxr/usd/usdGeom/xformCommonAPI.h>
|
||||||
#include <pxr/usd/usdLux/domeLight.h>
|
#include <pxr/usd/usdLux/domeLight.h>
|
||||||
@ -533,6 +535,19 @@ void dome_light_to_world_material(const USDImportParams ¶ms,
|
|||||||
pxr::UsdGeomXformCache xf_cache(motionSampleTime);
|
pxr::UsdGeomXformCache xf_cache(motionSampleTime);
|
||||||
pxr::GfMatrix4d xf = xf_cache.GetLocalToWorldTransform(dome_light.GetPrim());
|
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)) *
|
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;
|
pxr::GfMatrix4d().SetRotate(pxr::GfRotation(pxr::GfVec3d(1.0, 0.0, 0.0), -90.0)) * xf;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user