summaryrefslogtreecommitdiff
path: root/scene
diff options
context:
space:
mode:
authorAndrea Catania <info@andreacatania.com>2018-11-01 09:46:46 +0100
committerAndrea Catania <info@andreacatania.com>2018-11-01 09:46:46 +0100
commit0a4ceb34d33e9bb4b7e88015ae2b99c235256dd9 (patch)
tree51374ca3691d72707180fd4162abda32b62e4360 /scene
parent13eaded911ea1b0c48c0917f156f391ad39b8714 (diff)
Fixed crash on delete physical bone
Diffstat (limited to 'scene')
-rw-r--r--scene/3d/physics_body.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/scene/3d/physics_body.cpp b/scene/3d/physics_body.cpp
index 0fb0869979..13412147ab 100644
--- a/scene/3d/physics_body.cpp
+++ b/scene/3d/physics_body.cpp
@@ -2326,7 +2326,8 @@ void PhysicalBone::set_joint_type(JointType p_joint_type) {
if (p_joint_type == get_joint_type())
return;
- memdelete(joint_data);
+ if (joint_data)
+ memdelete(joint_data);
joint_data = NULL;
switch (p_joint_type) {
case JOINT_TYPE_PIN:
@@ -2526,7 +2527,8 @@ PhysicalBone::PhysicalBone() :
}
PhysicalBone::~PhysicalBone() {
- memdelete(joint_data);
+ if (joint_data)
+ memdelete(joint_data);
}
void PhysicalBone::update_bone_id() {