Tamito Kajiyama be50ce61be Merged ...

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.

2009-09-18 22:25:49 +00:00

..

CMakeLists.txt

Merged

2009-09-18 22:25:49 +00:00

Makefile

Patch from GSR that a) fixes a whole bunch of GPL/BL license

2008-04-16 22:40:48 +00:00

SConscript

Merged

2009-09-18 22:25:49 +00:00

SG_BBox.cpp

Merged

2009-09-18 22:25:49 +00:00

SG_BBox.h

Merged

2009-09-18 22:25:49 +00:00

SG_Controller.cpp

Patch from GSR that a) fixes a whole bunch of GPL/BL license

2008-04-16 22:40:48 +00:00

SG_Controller.h

Merged

2009-09-18 22:25:49 +00:00

SG_DList.h

Merged

2009-09-18 22:25:49 +00:00

SG_IObject.cpp

Merged

2009-09-18 22:25:49 +00:00

SG_IObject.h

Merged

2009-09-18 22:25:49 +00:00

SG_Node.cpp

Merged

2009-09-18 22:25:49 +00:00

SG_Node.h

Merged

2009-09-18 22:25:49 +00:00

SG_ParentRelation.h

Merged

2009-09-18 22:25:49 +00:00

SG_QList.h

Merged

2009-09-18 22:25:49 +00:00

SG_Spatial.cpp

Merged

2009-09-18 22:25:49 +00:00

SG_Spatial.h

Merged

2009-09-18 22:25:49 +00:00

SG_Tree.cpp

Patch from GSR that a) fixes a whole bunch of GPL/BL license

2008-04-16 22:40:48 +00:00

SG_Tree.h

Merged

2009-09-18 22:25:49 +00:00