asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #48217 from nekomatata/fix-mesh-instance-skinning-init

Browse source 
Fix skinning initialization in MeshInstance when loaded from thread
This commit is contained in:
Rémi Verschelde 2021-05-04 12:28:04 +02:00 committed by GitHub
commit 9052d56c92
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
scene/3d/mesh_instance.cpp
View file

@ -143,7 +143,7 @@ void MeshInstance::set_mesh(const Ref<Mesh> &p_mesh) {
mesh->connect(CoreStringNames::get_singleton()->changed, this, SceneStringNames::get_singleton()->_mesh_changed); mesh->connect(CoreStringNames::get_singleton()->changed, this, SceneStringNames::get_singleton()->_mesh_changed);
materials.resize(mesh->get_surface_count()); materials.resize(mesh->get_surface_count());
_initialize_skinning(); _initialize_skinning(false, false);
} else { } else {
set_base(RID()); set_base(RID());
@ -208,7 +208,7 @@ bool MeshInstance::_is_software_skinning_enabled() const {
return global_software_skinning; return global_software_skinning;
} }
void MeshInstance::_initialize_skinning(bool p_force_reset) { void MeshInstance::_initialize_skinning(bool p_force_reset, bool p_call_attach_skeleton) {
if (mesh.is_null()) { if (mesh.is_null()) {
return; return;
} }
@ -324,7 +324,9 @@ void MeshInstance::_initialize_skinning(bool p_force_reset) {
update_mesh = true; update_mesh = true;
} }
visual_server->instance_attach_skeleton(get_instance(), RID()); if (p_call_attach_skeleton) {
visual_server->instance_attach_skeleton(get_instance(), RID());
}
if (is_visible_in_tree() && (software_skinning_flags & SoftwareSkinning::FLAG_BONES_READY)) { if (is_visible_in_tree() && (software_skinning_flags & SoftwareSkinning::FLAG_BONES_READY)) {
// Intialize from current skeleton pose. // Intialize from current skeleton pose.
@ -336,7 +338,9 @@ void MeshInstance::_initialize_skinning(bool p_force_reset) {
skin_ref->get_skeleton_node()->disconnect("skeleton_updated", this, "_update_skinning"); skin_ref->get_skeleton_node()->disconnect("skeleton_updated", this, "_update_skinning");
} }
visual_server->instance_attach_skeleton(get_instance(), skin_ref->get_skeleton()); if (p_call_attach_skeleton) {
visual_server->instance_attach_skeleton(get_instance(), skin_ref->get_skeleton());
}
if (software_skinning) { if (software_skinning) {
memdelete(software_skinning); memdelete(software_skinning);
@ -345,7 +349,9 @@ void MeshInstance::_initialize_skinning(bool p_force_reset) {
} }
} }
} else { } else {
visual_server->instance_attach_skeleton(get_instance(), RID()); if (p_call_attach_skeleton) {
visual_server->instance_attach_skeleton(get_instance(), RID());
}
if (software_skinning) { if (software_skinning) {
memdelete(software_skinning); memdelete(software_skinning);
software_skinning = nullptr; software_skinning = nullptr;

2
scene/3d/mesh_instance.h
View file

@ -93,7 +93,7 @@ protected:
bool _is_software_skinning_enabled() const; bool _is_software_skinning_enabled() const;
static bool _is_global_software_skinning_enabled(); static bool _is_global_software_skinning_enabled();
void _initialize_skinning(bool p_force_reset = false); void _initialize_skinning(bool p_force_reset = false, bool p_call_attach_skeleton = true);
void _update_skinning(); void _update_skinning();
protected: protected: