[Bf-blender-cvs] [42f6442] fracture_modifier: windows compile fix
Martin Felke
noreply at git.blender.org
Thu Oct 22 21:53:31 CEST 2015
Commit: 42f644204c887193da4c0dddc669f79ede24ae7f
Author: Martin Felke
Date: Thu Oct 22 21:53:18 2015 +0200
Branches: fracture_modifier
https://developer.blender.org/rB42f644204c887193da4c0dddc669f79ede24ae7f
windows compile fix
===================================================================
M extern/bullet2/src/BulletDynamics/ConstraintSolver/btCompoundConstraint.cpp
===================================================================
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btCompoundConstraint.cpp b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btCompoundConstraint.cpp
index 6965035..2f621ea 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btCompoundConstraint.cpp
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btCompoundConstraint.cpp
@@ -2,7 +2,7 @@
#include "btCompoundConstraint.h"
btCompoundConstraint::btCompoundConstraint(btRigidBody& rbA, btRigidBody& rbB)
- :btTypedConstraint::btTypedConstraint(COMPOUND_CONSTRAINT_TYPE, rbA, rbB)
+ :btTypedConstraint(static_cast<btTypedConstraintType>(COMPOUND_CONSTRAINT_TYPE), rbA, rbB)
{
}
More information about the Bf-blender-cvs
mailing list