Merge remote-tracking branch 'b/main'

UPBGE · Jan 17, 2025 · d035e52 · d035e52
2 parents 6522110 + 0a72db9
commit d035e52
Show file tree

Hide file tree

Showing 111 changed files with 1,716 additions and 1,427 deletions.
diff --git a/build_files/cmake/packaging.cmake b/build_files/cmake/packaging.cmake
@@ -91,7 +91,9 @@ if(WIN32)
 
   set(CPACK_NSIS_MUI_ICON ${CMAKE_SOURCE_DIR}/release/windows/icons/winblender.ico)
   set(CPACK_NSIS_COMPRESSOR "/SOLID lzma")
-
+
+  # Eventhough we no longer display this, we still need to set it otherwise it'll throw an error
+  # during the msi build. 
   set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/release/license/spdx/GPL-3.0-or-later.txt)
   set(CPACK_WIX_PRODUCT_ICON ${CMAKE_SOURCE_DIR}/release/windows/icons/winblender.ico)
 
@@ -106,7 +108,8 @@ if(WIN32)
   set(CPACK_WIX_TEMPLATE ${CMAKE_SOURCE_DIR}/release/windows/installer_wix/WIX.template)
   set(CPACK_WIX_UI_BANNER ${CMAKE_SOURCE_DIR}/release/windows/installer_wix/WIX_UI_BANNER.bmp)
   set(CPACK_WIX_UI_DIALOG ${CMAKE_SOURCE_DIR}/release/windows/installer_wix/WIX_UI_DIALOG.bmp)
-
+  set(CPACK_WIX_EXTRA_SOURCES ${CMAKE_SOURCE_DIR}/release/windows/installer_wix/WixUI_Blender.wxs)
+  set(CPACK_WIX_UI_REF "WixUI_Blender")
   set(CPACK_WIX_LIGHT_EXTRA_FLAGS -dcl:medium)
 endif()
 

diff --git a/doc/python_api/examples/bpy.types.HydraRenderEngine.py b/doc/python_api/examples/bpy.types.HydraRenderEngine.py
@@ -22,6 +22,9 @@ class CustomHydraRenderEngine(bpy.types.HydraRenderEngine):
     # Register path to plugin.
     @classmethod
     def register(cls):
+        # Make pxr module available, for running as bpy pip package.
+        bpy.utils.expose_bundled_modules()
+
         import pxr.Plug
         pxr.Plug.Registry().RegisterPlugins(['/path/to/plugin'])
 

diff --git a/doc/python_api/examples/bpy.types.USDHook.py b/doc/python_api/examples/bpy.types.USDHook.py
@@ -185,11 +185,15 @@
 
 import bpy
 import bpy.types
+import textwrap
+
+# Make pxr module available, for running as bpy pip package.
+bpy.utils.expose_bundled_modules()
+
 import pxr.Gf as Gf
 import pxr.Sdf as Sdf
 import pxr.Usd as Usd
 import pxr.UsdShade as UsdShade
-import textwrap
 
 
 class USDHookExample(bpy.types.USDHook):

diff --git a/intern/cycles/blender/CMakeLists.txt b/intern/cycles/blender/CMakeLists.txt
@@ -58,6 +58,7 @@ set(LIB
   PRIVATE bf::blenkernel
   PRIVATE bf::blenlib
   PRIVATE bf::dna
+  PRIVATE bf::imbuf
   PRIVATE bf::gpu
   PRIVATE bf::intern::guardedalloc
   PRIVATE bf::render