godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-23 15:16:17 +00:00
Code Releases Wiki Activity

Fix build after c2a9cb34

Browse Source 
`return` statements were missing, and those warnings do not need to be
behind #ifdefs, they do not expose any deprecated API.
This commit is contained in:
Rémi Verschelde
2018-08-27 10:10:40 +02:00
parent 3c0ea513de
commit ddfef86836
4 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/bullet/cone_twist_joint_bullet.cpp
View File

@@ -82,11 +82,10 @@ void ConeTwistJointBullet::set_param(PhysicsServer::ConeTwistJointParam p_param,
case PhysicsServer::CONE_TWIST_JOINT_RELAXATION:
coneConstraint->setLimit(coneConstraint->getSwingSpan1(), coneConstraint->getSwingSpan2(), coneConstraint->getTwistSpan(), coneConstraint->getLimitSoftness(), coneConstraint->getBiasFactor(), p_value);
break;
#ifndef DISABLE_DEPRECATED
default:
ERR_EXPLAIN("This parameter " + itos(p_param) + " is deprecated");
WARN_DEPRECATED
#endif // DISABLE_DEPRECATED
break;
}
}
@@ -102,11 +101,9 @@ real_t ConeTwistJointBullet::get_param(PhysicsServer::ConeTwistJointParam p_para
return coneConstraint->getLimitSoftness();
case PhysicsServer::CONE_TWIST_JOINT_RELAXATION:
return coneConstraint->getRelaxationFactor();
#ifndef DISABLE_DEPRECATED
default:
ERR_EXPLAIN("This parameter " + itos(p_param) + " is deprecated");
WARN_DEPRECATED;
return 0;
#endif // DISABLE_DEPRECATED
}
}