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

Merge branch 'blender-v4.3-release'

Browse Source
This commit is contained in:
Philipp Oeser
2024-10-10 13:55:29 +02:00
parent 22eac7655d 9baf082dc5
commit e89cf5ecc0
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/modules/bpy_extras/anim_utils.py
View File

@@ -364,7 +364,7 @@ def bake_action_iter(
atd.use_tweak_mode = False
atd.action = action
if action.is_action_layered:
if bpy.context.preferences.experimental.use_animation_baklava and action.is_action_layered:
slot = action.slots.new(for_id=obj)
atd.action_slot = slot

2
scripts/presets/keyconfig/keymap_data/blender_default.py
View File

@@ -4950,7 +4950,7 @@ def km_sculpt(params):
("relative_asset_identifier", "brushes/essentials_brushes-mesh_sculpt.blend/Brush/Clay Strips")]}),
("brush.asset_activate", {"type": 'C', "value": 'PRESS', "shift": True},
{"properties": [("asset_library_type", 'ESSENTIALS'),
("relative_asset_identifier", "brushes/essentials_brushes-mesh_sculpt.blend/Brush/Crease")]}),
("relative_asset_identifier", "brushes/essentials_brushes-mesh_sculpt.blend/Brush/Crease Polish")]}),
("brush.asset_activate", {"type": 'K', "value": 'PRESS'},
{"properties": [("asset_library_type", 'ESSENTIALS'),
("relative_asset_identifier", "brushes/essentials_brushes-mesh_sculpt.blend/Brush/Snake Hook")]}),

7
source/blender/blenkernel/intern/armature_deform.cc
View File

@@ -672,7 +672,12 @@ void BKE_armature_deform_coords_with_mesh(const Object *ob_arm,
const char *defgrp_name,
const Mesh *me_target)
{
const ListBase *defbase = BKE_id_defgroup_list_get(static_cast<const ID *>(ob_target->data));
/* Note armature modifier on legacy curves calls this, so vertex groups are not guaranteed to
* exist. */
const ID *id_target = static_cast<const ID *>(ob_target->data);
const ListBase *defbase = BKE_id_supports_vertex_groups(id_target) ?
BKE_id_defgroup_list_get(id_target) :
nullptr;
blender::Span<MDeformVert> dverts;
if (ob_target->type == OB_MESH) {
if (me_target == nullptr) {