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

Merge pull request #23430 from AndreaCatania/pb_f

Browse Source 
Fixed crash on delete physical bone
This commit is contained in:
Rémi Verschelde 2018-11-01 09:58:48 +01:00 committed by GitHub
commit 629294e8f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scene/3d/physics_body.cpp
View File

@ -2326,7 +2326,8 @@ void PhysicalBone::set_joint_type(JointType p_joint_type) {
if (p_joint_type == get_joint_type()) if (p_joint_type == get_joint_type())
return; return;
memdelete(joint_data); if (joint_data)
memdelete(joint_data);
joint_data = NULL; joint_data = NULL;
switch (p_joint_type) { switch (p_joint_type) {
case JOINT_TYPE_PIN: case JOINT_TYPE_PIN:
@ -2526,7 +2527,8 @@ PhysicalBone::PhysicalBone() :
} }
PhysicalBone::~PhysicalBone() { PhysicalBone::~PhysicalBone() {
memdelete(joint_data); if (joint_data)
memdelete(joint_data);
} }
void PhysicalBone::update_bone_id() { void PhysicalBone::update_bone_id() {