From 77934cfaed55b559637e37ce9c158cd703cec360 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 4 Nov 2011 15:53:34 +0000 Subject: 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. --- source/blender/makesdna/DNA_object_types.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'source/blender/makesdna/DNA_object_types.h') diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 3e17d7f4942..d158f227df5 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -265,7 +265,9 @@ typedef struct Object { ListBase *duplilist; /* for temporary dupli list storage, only for use by RNA API */ float ima_ofs[2]; /* offset for image empties */ - char pad3[8]; + + short collision_boundtype; /* bounding box type used for collision */ + char pad3[6]; } Object; /* Warning, this is not used anymore because hooks are now modifiers */ -- cgit v1.2.3