Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2012-04-19 19:14:28 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2012-04-19 19:14:28 +0400
commit6b006059ec55c6d0f0c8e7302b9b16bb81ee2365 (patch)
tree5cfaceb8bba54d33c20046b9c91884cb47f4bebd /source/gameengine
parent801aaf5cdc46fca052b76b80d02c4e82f04a1d90 (diff)
Fix #31016: rigid body joint constraint in game engine did not respect constraint
enable/disable option.
Diffstat (limited to 'source/gameengine')
-rw-r--r--source/gameengine/Converter/BL_BlenderDataConversion.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
index e112537d0f6..4c7170c4c9e 100644
--- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp
+++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
@@ -2757,7 +2757,7 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
bRigidBodyJointConstraint *dat=(bRigidBodyJointConstraint *)curcon->data;
- if (!dat->child) {
+ if (!dat->child && !(curcon->flag & CONSTRAINT_OFF)) {
PHY_IPhysicsController* physctr2 = 0;