archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merged

Browse Source 
https://svn.blender.org/svnroot/bf-blender/branches/soc-2008-mxcurioni (r22789) and
https://svn.blender.org/svnroot/bf-blender/trunk/blender (r23338)
with the "Ignore ancestry" and "Ignore line endings" options enabled (using
TortoiseSVN on Windows).

After the merge operation, all changes (i.e., deletion) in source/blender/freestyle/
were reverted in order to keep the primary source tree of the Freestyle renderer.
This commit is contained in:
Tamito Kajiyama
2009-09-18 22:25:49 +00:00
parent 0a4d70f4d0
commit be50ce61be
3509 changed files with 612152 additions and 643374 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/gameengine/SceneGraph/SG_BBox.cpp
View File

@@ -34,8 +34,8 @@
#include "SG_Node.h"
SG_BBox::SG_BBox() :
m_min(MT_Point3(0., 0., 0.)),
m_max(MT_Point3(0., 0., 0.))
m_min(0., 0., 0.),
m_max(0., 0., 0.)
{
}
@@ -188,6 +188,13 @@ void SG_BBox::getaa(MT_Point3 *box, const MT_Transform &world) const
*box++ = max;
}
void SG_BBox::getmm(MT_Point3 *box, const MT_Transform &world) const
{
const MT_Point3 min(world(m_min)), max(world(m_max));
*box++ = min;
*box++ = max;
}
void SG_BBox::split(SG_BBox &left, SG_BBox &right) const
{
MT_Scalar sizex = m_max[0] - m_min[0];