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:
authorSergey Sharybin <sergey.vfx@gmail.com>2011-11-04 19:53:34 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2011-11-04 19:53:34 +0400
commit77934cfaed55b559637e37ce9c158cd703cec360 (patch)
tree19c3e947a70b89dd7e000a72d3aaf1be8c707a2e /source/gameengine/Converter
parentac47da5d6b42ba605a652d681c36c50e40c81646 (diff)
Fix #28865: Draw_bounds_type does not display Polyhedron or Capsule types
Separate DNA properties for bounding box used for bounding box display in 3d viewport and bounding box used for collision detection in game engine. Bumped subversion for proper updating old files to new system, but it need more complex testing.
Diffstat (limited to 'source/gameengine/Converter')
-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 ca37b06d12e..779d794cc10 100644
--- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp
+++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
@@ -1579,7 +1579,7 @@ void BL_CreatePhysicsObjectNew(KX_GameObject* gameobj,
my_get_local_bounds(blenderobject,dm,objprop.m_boundobject.box.m_center,bb.m_extends);
if (blenderobject->gameflag & OB_BOUNDS)
{
- switch (blenderobject->boundtype)
+ switch (blenderobject->collision_boundtype)
{
case OB_BOUND_BOX:
objprop.m_boundclass = KX_BOUNDBOX;