Merge remote-tracking branch 'origin/blender-v4.2-release'

scripts/modules/keyingsets_utils.py

@@ -212,7 +212,8 @@ def RKS_GEN_custom_props(_ksi, _context, ks, data):
     # Only some RNA types can be animated.
     prop_type_compat = {bpy.types.BoolProperty,
                         bpy.types.IntProperty,
-                        bpy.types.FloatProperty}
+                        bpy.types.FloatProperty,
+                        bpy.types.EnumProperty}
 
     # When working with a pose, 'id_block' is the armature object (which should
     # get the animation data), whereas 'data' is the bone being keyed.

scripts/startup/keyingsets_builtins.py

@@ -505,6 +505,7 @@ class WholeCharacterMixin:
             bpy.types.BoolProperty,
             bpy.types.IntProperty,
             bpy.types.FloatProperty,
+            bpy.types.EnumProperty,
         }
 
         # go over all custom properties for bone

source/blender/blenloader/intern/versioning_defaults.cc

@@ -40,6 +40,7 @@
 #include "DNA_userdef_types.h"
 #include "DNA_windowmanager_types.h"
 #include "DNA_workspace_types.h"
+#include "DNA_world_types.h"
 
 #include "BKE_appdir.hh"
 #include "BKE_attribute.hh"
@@ -921,4 +922,10 @@ void BLO_update_defaults_startup_blend(Main *bmain, const char *app_template)
       SET_FLAG_FROM_TEST(light->mode, false, LA_SHAD_RES_ABSOLUTE);
     }
   }
+
+  {
+    LISTBASE_FOREACH (World *, world, &bmain->worlds) {
+      SET_FLAG_FROM_TEST(world->flag, true, WO_USE_SUN_SHADOW);
+    }
+  }
 }

source/blender/draw/engines/eevee_next/shaders/eevee_film_lib.glsl

@@ -20,7 +20,7 @@ float film_depth_convert_to_scene(float depth)
     /* TODO */
     return 1.0;
   }
-  return abs(drw_depth_screen_to_view(depth));
+  return -drw_depth_screen_to_view(depth);
 }
 
 /* Load a texture sample in a specific format. Combined pass needs to use this. */

source/blender/editors/armature/armature_utils.cc

@@ -129,6 +129,7 @@ void bone_free(bArmature *arm, EditBone *bone)
     }
   }
 
+  BLI_freelistN(&bone->bone_collections);
   BLI_freelinkN(arm->edbo, bone);
 }
 

source/blender/makesdna/DNA_scene_defaults.h

@@ -184,6 +184,7 @@
     .gi_irradiance_smoothing = 0.1f, \
     .gi_filter_quality = 3.0f, \
     .gi_irradiance_pool_size = 16, \
+    .shadow_pool_size = 512, \
  \
     .taa_samples = 16, \
     .taa_render_samples = 64, \