Merge remote-tracking branch 'b/main'

.gitignore

@@ -82,3 +82,7 @@ waveletNoiseTile.bin
 CMakeSettings.json
 CMakePresets.json
 CMakeUserPresets.json
+
+# Compile commands generated by CMake that may be linked into the source code
+# folder to make it easier for tools like clangd to discover.
+compile_commands.json

build_files/build_environment/cmake/versions.cmake

@@ -96,7 +96,7 @@ set(BOOST_VERSION 1.82.0)
 set(BOOST_VERSION_SHORT 1.82)
 set(BOOST_VERSION_NODOTS 1_82_0)
 set(BOOST_VERSION_NODOTS_SHORT 1_82)
-set(BOOST_URI https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION}/source/boost_${BOOST_VERSION_NODOTS}.tar.gz)
+set(BOOST_URI https://archives.boost.io/release/${BOOST_VERSION}/source/boost_${BOOST_VERSION_NODOTS}.tar.gz)
 set(BOOST_HASH f7050f554a65f6a42ece221eaeec1660)
 set(BOOST_HASH_TYPE MD5)
 set(BOOST_FILE boost_${BOOST_VERSION_NODOTS}.tar.gz)

build_files/config/pipeline_config.yaml

@@ -13,7 +13,10 @@ buildbot:
     cuda12:
         version: '12.1.1'
     hip:
-        version: '5.7.32000'
+        windows:
+            version: '5.7.32000'
+        linux:
+            version: '6.1.3'
     optix:
         version: '7.4.0'
     ocloc:

intern/cycles/blender/display_driver.cpp

@@ -62,6 +62,11 @@ static GPUShader *compile_fallback_shader()
   return shader;
 }
 
+BlenderFallbackDisplayShader::~BlenderFallbackDisplayShader()
+{
+  destroy_shader();
+}
+
 GPUShader *BlenderFallbackDisplayShader::bind(const int width, const int height)
 {
   create_shader_if_needed();
@@ -880,6 +885,8 @@ void BlenderDisplayDriver::gpu_resources_destroy()
 {
   gpu_context_enable();
 
+  display_shader_.reset();
+
   tiles_->current_tile.gpu_resources_destroy();
   tiles_->finished_tiles.gl_resources_destroy_and_clear();
 

intern/cycles/blender/display_driver.h

@@ -52,6 +52,8 @@ class BlenderDisplayShader {
  * display space shader. */
 class BlenderFallbackDisplayShader : public BlenderDisplayShader {
  public:
+  ~BlenderFallbackDisplayShader() override;
+
   GPUShader *bind(const int width, const int height) override;
   void unbind() override;
 

intern/cycles/device/oneapi/device_impl.cpp

@@ -550,7 +550,7 @@ void OneapiDevice::const_copy_to(const char *name, void *host, const size_t size
         this, name, MEM_READ_ONLY);
     data_ptr->alloc(size);
     data = data_ptr.get();
-    const_mem_map_.insert(ConstMemMap::value_type(name, std::move(data)));
+    const_mem_map_.insert(ConstMemMap::value_type(name, std::move(data_ptr)));
   }
   else {
     data = i->second.get();

intern/cycles/hydra/field.cpp

@@ -4,9 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0 */
 
 #include "hydra/field.h"
-#include "hydra/session.h"
-#include "scene/image_vdb.h"
-#include "scene/scene.h"
+
+#ifdef WITH_OPENVDB
+#  include "hydra/session.h"
+#  include "scene/image_vdb.h"
+#  include "scene/scene.h"
+#endif
 
 #include <pxr/imaging/hd/sceneDelegate.h>
 #include <pxr/usd/sdf/assetPath.h>
@@ -93,6 +96,9 @@ void HdCyclesField::Sync(HdSceneDelegate *sceneDelegate,
       }
     }
   }
+#else
+  (void)sceneDelegate;
+  (void)renderParam;
 #endif
 
   *dirtyBits = DirtyBits::Clean;

intern/cycles/kernel/CMakeLists.txt

@@ -730,7 +730,7 @@ endif()
 # HIP RT module
 
 if(WITH_CYCLES_DEVICE_HIPRT)
-  set(HIPRT_COMPILER_PARALLEL_JOBS 1 CACHE STRING "Number of parallel compiler instances to use for for HIP-RT kernels")
+  set(HIPRT_COMPILER_PARALLEL_JOBS 1 CACHE STRING "Number of parallel compiler instances to use for HIP-RT kernels")
   mark_as_advanced(HIPRT_COMPILER_PARALLEL_JOBS)
 
   set(bvh_file ${CMAKE_CURRENT_BINARY_DIR}/hiprt${HIPRT_VERSION}_${HIP_VERSION_SHORT}_amd.hipfb)

intern/cycles/kernel/svm/closure.h

@@ -138,7 +138,11 @@ ccl_device
 
       // get Disney principled parameters
       const float metallic = saturatef(param1);
+#ifdef __SUBSURFACE__
       const float subsurface_weight = saturatef(param2);
+#else
+      const float subsurface_weight = 0.0f;
+#endif
       const float specular_ior_level = max(stack_load_float(stack, specular_ior_level_offset),
                                            0.0f);
       const float roughness = saturatef(stack_load_float(stack, roughness_offset));
@@ -450,7 +454,6 @@ ccl_device
         sd->flag |= bssrdf_setup(sd, bssrdf, path_flag, subsurface_method);
       }
 #else
-      subsurface_weight = 0.0f;
       (void)data_subsurf;
 #endif
 

intern/cycles/scene/integrator.cpp

@@ -130,6 +130,7 @@ NODE_DEFINE(Integrator)
   SOCKET_FLOAT(scrambling_distance, "Scrambling Distance", 1.0f);
 
   static NodeEnum denoiser_type_enum;
+  denoiser_type_enum.insert("none", DENOISER_NONE);
   denoiser_type_enum.insert("optix", DENOISER_OPTIX);
   denoiser_type_enum.insert("openimagedenoise", DENOISER_OPENIMAGEDENOISE);
 

intern/cycles/scene/object.cpp

@@ -1055,9 +1055,9 @@ void ObjectManager::apply_static_transforms(DeviceScene *dscene, Scene *scene, P
       Mesh *mesh = static_cast<Mesh *>(geom);
       apply = apply && mesh->get_subdivision_type() == Mesh::SUBDIVISION_NONE;
     }
-    else if (geom->is_hair()) {
-      /* Can't apply non-uniform scale to curves, this can't be represented by
-       * control points and radius alone. */
+    else if (geom->is_hair() || geom->is_pointcloud()) {
+      /* Can't apply non-uniform scale to curves and points, this can't be
+       * represented by control points and radius alone. */
       float scale;
       apply = apply && transform_uniform_scale(object->tfm, scale);
     }

intern/eigen/eigen_capi.h

@@ -9,9 +9,9 @@
 #ifndef __EIGEN_C_API_H__
 #define __EIGEN_C_API_H__
 
-#include "intern/eigenvalues.h"
-#include "intern/linear_solver.h"
-#include "intern/matrix.h"
-#include "intern/svd.h"
+#include "intern/eigenvalues.h"    // IWYU pragma: export
+#include "intern/linear_solver.h"  // IWYU pragma: export
+#include "intern/matrix.h"         // IWYU pragma: export
+#include "intern/svd.h"            // IWYU pragma: export
 
 #endif /* __EIGEN_C_API_H__ */

intern/ghost/intern/GHOST_SystemWin32.cc

@@ -1263,7 +1263,7 @@ GHOST_EventKey *GHOST_SystemWin32::processKeyEvent(GHOST_WindowWin32 *window, RA
   constexpr USHORT ALTGR_MAKE_CODE = 0x38;
 
   /* If the keyboard layout includes AltGr and the virtual key is Control, yet the
-   * scancode is actually for Right Alt (ALTGR_MAKE_CODE scan code with E0 prefix).
+   * scan-code is actually for Right Alt (ALTGR_MAKE_CODE scan code with E0 prefix).
    * Ignore these, so treating AltGR as regular Alt. #68256 */
   if (system->m_hasAltGr && vk == VK_CONTROL && raw.data.keyboard.MakeCode == ALTGR_MAKE_CODE &&
       (raw.data.keyboard.Flags & RI_KEY_E0))

release/datafiles/userdef/userdef_default.c

@@ -23,8 +23,7 @@
 const UserDef U_default = {
     .versionfile = BLENDER_FILE_VERSION,
     .subversionfile = BLENDER_FILE_SUBVERSION,
-    .flag = (USER_AUTOSAVE | USER_TOOLTIPS | USER_RELPATHS | USER_RELEASECONFIRM |
-             USER_SCRIPT_AUTOEXEC_DISABLE | USER_NONEGFRAMES),
+    .flag = (USER_AUTOSAVE | USER_TOOLTIPS | USER_RELPATHS | USER_RELEASECONFIRM),
     .dupflag = USER_DUP_MESH | USER_DUP_CURVE | USER_DUP_SURF | USER_DUP_LATTICE | USER_DUP_FONT |
                USER_DUP_MBALL | USER_DUP_LAMP | USER_DUP_ARM | USER_DUP_CAMERA | USER_DUP_SPEAKER |
                USER_DUP_ACT | USER_DUP_LIGHTPROBE | USER_DUP_GPENCIL | USER_DUP_CURVES |
@@ -53,7 +52,7 @@ const UserDef U_default = {
     .mini_axis_type = USER_MINI_AXIS_TYPE_GIZMO,
     .uiflag = (USER_FILTERFILEEXTS | USER_DRAWVIEWINFO | USER_PLAINMENUS |
                USER_LOCK_CURSOR_ADJUST | USER_DEPTH_CURSOR | USER_AUTOPERSP |
-               USER_NODE_AUTO_OFFSET | USER_GLOBALUNDO | USER_HIDE_DOT | USER_SHOW_GIZMO_NAVIGATE |
+               USER_NODE_AUTO_OFFSET | USER_GLOBALUNDO | USER_SHOW_GIZMO_NAVIGATE |
                USER_SHOW_VIEWPORTNAME | USER_SHOW_FPS | USER_CONTINUOUS_MOUSE | USER_SAVE_PROMPT),
     .uiflag2 = USER_REGION_OVERLAP,
     .gpu_flag = USER_GPU_FLAG_OVERLAY_SMOOTH_WIRE | USER_GPU_FLAG_SUBDIVISION_EVALUATION,

release/freedesktop/org.upbge.UPBGE.desktop

@@ -84,7 +84,6 @@ Icon=org.upbge.UPBGE
 Terminal=false
 Type=Application
 PrefersNonDefaultGPU=true
-X-KDE-RunOnDiscreteGpu=true
 Categories=Graphics;3DGraphics;
 MimeType=application/x-blender;
 StartupWMClass=Blender