diff options
author | Daniel Genrich <daniel.genrich@gmx.net> | 2008-05-24 00:36:05 +0400 |
---|---|---|
committer | Daniel Genrich <daniel.genrich@gmx.net> | 2008-05-24 00:36:05 +0400 |
commit | 10dde9b7d74bc3f5b6bd177d46d1ec103e9191e8 (patch) | |
tree | 3f1dc5887725e9119c0505f9e37e7fb679661d99 /source/blender/makesdna | |
parent | 4bf01e8162dd3c30791a8a1d5d20fc80fbdef1ac (diff) | |
parent | 5f70682f6a622b2832e50860cc2699c67d9b7e65 (diff) |
Merging revisions 14838-14945 of https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 21 | ||||
-rw-r--r-- | source/blender/makesdna/intern/SConscript | 1 |
2 files changed, 21 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index de89c0e51cb..83168248b9a 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -59,6 +59,27 @@ typedef struct bDeformGroup { char name[32]; } bDeformGroup; +/** + * The following illustrates the orientation of the + * bounding box in local space + * + * + * Z Y + * | / + * |/ + * .-----X + * + * + * 2----------6 + * /| /| + * / | / | + * 1----------5 | + * | | | | + * | 3-------|--7 + * | / | / + * |/ |/ + * 0----------4 + */ typedef struct BoundBox { float vec[8][3]; int flag, pad; diff --git a/source/blender/makesdna/intern/SConscript b/source/blender/makesdna/intern/SConscript index 512e6817666..acba9ae2d1d 100644 --- a/source/blender/makesdna/intern/SConscript +++ b/source/blender/makesdna/intern/SConscript @@ -26,7 +26,6 @@ if sys.platform != 'cygwin': makesdna_tool.Append (CCFLAGS = cflags) makesdna_tool.Append (CPPDEFINES = defines) makesdna_tool.Append (LIBPATH = '#'+root_build_dir+'/lib') -makesdna_tool.Append (LINKFLAGS = env['PLATFORM_LINKFLAGS']) if env['BF_PROFILE']: makesdna_tool.Append (LINKFLAGS = env['BF_PROFILE_FLAGS']) |