griefith/test2
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:
Lukas Tönne
2024-11-13 13:39:35 +01:00
parent 82ec1aa344 f7ffef07d4
commit 702bdde96d
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/animation/anim_channels_edit.cc
View File

@@ -2097,6 +2097,8 @@ static void rearrange_grease_pencil_channels(bAnimContext *ac, eRearrangeAnimCha
}
break;
}
default:
break;
}
}
}

4
source/blender/editors/grease_pencil/intern/grease_pencil_layers.cc
View File

@@ -43,7 +43,7 @@ bool grease_pencil_layer_parent_set(bke::greasepencil::Layer &layer,
}
layer.parent = parent;
BLI_strncpy(layer.parsubstr, bone.c_str(), sizeof(layer.parsubstr));
layer.parsubstr = BLI_strdup_null(bone.c_str());
/* Calculate inverse parent matrix. */
if (parent) {
copy_m4_m4(layer.parentinv, parent->world_to_object().ptr());
@@ -65,7 +65,7 @@ void grease_pencil_layer_parent_clear(bke::greasepencil::Layer &layer, const boo
}
layer.parent = nullptr;
layer.parsubstr[0] = 0;
MEM_SAFE_FREE(layer.parsubstr);
copy_m4_m4(layer.parentinv, float4x4::identity().ptr());
}

2
source/blender/makesrna/intern/rna_grease_pencil.cc
View File

@@ -367,7 +367,7 @@ static void rna_GreasePencilLayer_parent_set(PointerRNA *ptr,
bke::greasepencil::Layer &layer = static_cast<GreasePencilLayer *>(ptr->data)->wrap();
Object *parent = static_cast<Object *>(value.data);
ed::greasepencil::grease_pencil_layer_parent_set(layer, parent, layer.parsubstr, false);
ed::greasepencil::grease_pencil_layer_parent_set(layer, parent, layer.parent_bone_name(), false);
}
static void rna_GreasePencilLayer_bone_set(PointerRNA *ptr, const char *value)