griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.5-release'

Browse Source
This commit is contained in:
Miguel Pozo
2025-07-10 18:00:04 +02:00
parent 94e9203713 44faabdedd
commit b5ca00a403
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/device/metal/bvh.mm
View File

@@ -1215,8 +1215,10 @@ bool BVHMetal::build_TLAS(Progress &progress,
# if defined(MAC_OS_VERSION_15_0)
if (use_pcmi) {
if (ob->get_geometry()->is_instanced()) {
DecomposedTransform decomp;
transform_motion_decompose(&decomp, &ob->get_tfm(), 1);
decomposed_motion_transforms[motion_transform_index++] =
decomposed_to_component_transform(decomp[0]);
decomposed_to_component_transform(decomp);
}
else {
decomposed_motion_transforms[motion_transform_index++] =

3
source/blender/draw/intern/draw_shader_shared.hh
View File

@@ -154,7 +154,10 @@ enum eObjectInfoFlag : uint32_t {
/* Avoid skipped info to change culling. */
OBJECT_NO_INFO = ~OBJECT_HOLDOUT
};
#if !defined(GPU_SHADER) && defined(__cplusplus)
ENUM_OPERATORS(eObjectInfoFlag, OBJECT_ACTIVE_EDIT_MODE);
#endif
struct ObjectInfos {
/** Uploaded as center + size. Converted to mul+bias to local coord. */