Merge remote-tracking branch 'origin/blender-v3.4-release'

This commit is contained in:
Ray molenkamp 2022-11-20 18:31:53 -07:00
commit 7a6cdeb242
Notes: blender-bot 2023-11-22 14:31:54 +01:00
Referenced by issue #102700, Regression: Viewer node crash on empty by non-null mesh after join geometry with attribute output on viewer
Referenced by issue #102662, NLA-Strip Corrupted after reopening file with library override
Referenced by issue #102653, `insert_keyframe` takes too long, appears to run in linear time over the number of existing keyframes
Referenced by pull request #107575, Fix #107566: Gesture face set respect hidden faces
Referenced by issue #115226, A Shader Compile Error Occurs with Two AOV Outputs in a Specific Shader Node Configuration
1 changed files with 2 additions and 2 deletions

View File

@ -106,8 +106,8 @@ if(WIN32)
set(CPACK_WIX_LIGHT_EXTRA_FLAGS -dcl:medium)
endif()
set(CPACK_PACKAGE_EXECUTABLES "blender-launcher" "Blender")
set(CPACK_CREATE_DESKTOP_LINKS "blender-launcher" "Blender")
set(CPACK_PACKAGE_EXECUTABLES "blender-launcher" "Blender ${MAJOR_VERSION}.${MINOR_VERSION}")
set(CPACK_CREATE_DESKTOP_LINKS "blender-launcher" "Blender ${MAJOR_VERSION}.${MINOR_VERSION}")
include(CPack)