seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #112267 from KoBeWi/sk8leton

Browse Source 
Remove default skeleton path in MeshInstance3D
This commit is contained in:
Rémi Verschelde
2025-11-01 19:06:42 +01:00
parent 4ca3a9094f d27fb9b15a
commit 402805d26f
6 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scene/3d/mesh_instance_3d.cpp
View File

@ -926,6 +926,11 @@ void MeshInstance3D::_bind_methods() {
MeshInstance3D::MeshInstance3D() {
_define_ancestry(AncestralClass::MESH_INSTANCE_3D);
#ifndef DISABLE_DEPRECATED
if (use_parent_skeleton_compat) {
skeleton_path = NodePath("..");
}
#endif
}
MeshInstance3D::~MeshInstance3D() {

6
scene/3d/mesh_instance_3d.h
View File

@ -49,7 +49,7 @@ protected:
Ref<Skin> skin;
Ref<Skin> skin_internal;
Ref<SkinReference> skin_ref;
NodePath skeleton_path = NodePath("..");
NodePath skeleton_path;
LocalVector<float> blend_shape_tracks;
HashMap<StringName, int> blend_shape_properties;
@ -73,6 +73,10 @@ protected:
public:
static constexpr AncestralClass static_ancestral_class = AncestralClass::MESH_INSTANCE_3D;
#ifndef DISABLE_DEPRECATED
static inline bool use_parent_skeleton_compat = false;
#endif
void set_mesh(const Ref<Mesh> &p_mesh);
Ref<Mesh> get_mesh() const;

3
scene/register_scene_types.cpp
View File

@ -607,6 +607,9 @@ void register_scene_types() {
GDREGISTER_CLASS(Camera3D);
GDREGISTER_CLASS(AudioListener3D);
GDREGISTER_CLASS(MeshInstance3D);
#ifndef DISABLE_DEPRECATED
MeshInstance3D::use_parent_skeleton_compat = GLOBAL_GET("animation/compatibility/default_parent_skeleton_in_mesh_instance_3d");
#endif
GDREGISTER_CLASS(OccluderInstance3D);
GDREGISTER_ABSTRACT_CLASS(Occluder3D);
GDREGISTER_CLASS(ArrayOccluder3D);