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

..

unix

Merged

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

windows

Merged

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

bmfont.cpp

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

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

CMakeLists.txt

Merged

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

GPC_Canvas.cpp

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

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

GPC_Canvas.h

BGE Bug Fix:#17349, fixes some problems about 2d-filters

2008-07-20 23:03:01 +00:00

GPC_Engine.cpp

Merged

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

GPC_Engine.h

Merged

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

GPC_KeyboardDevice.cpp

Merged

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

GPC_KeyboardDevice.h

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

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

GPC_MouseDevice.cpp

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

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

GPC_MouseDevice.h

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

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

GPC_RawImage.cpp

[#17600] char* -> const char*

2008-09-20 11:08:35 +00:00

GPC_RawImage.h

[#17600] char* -> const char*

2008-09-20 11:08:35 +00:00

GPC_RawLoadDotBlendArray.cpp

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

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

GPC_RawLoadDotBlendArray.h

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

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

GPC_RawLogoArrays.cpp

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

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

GPC_RawLogoArrays.h

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

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

GPC_RenderTools.cpp

Merged

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

GPC_RenderTools.h

Merged

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

GPC_System.cpp

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

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

GPC_System.h

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

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

load.blend

some minor webplugin changes, new loading .blend, upgraded version to 2.42, enabled PhysicsConstraints module within sandbox.

2006-07-06 07:58:07 +00:00

logo_blender3d.raw

Initial revision

2002-10-12 11:37:38 +00:00

logo_blender.raw

Initial revision

2002-10-12 11:37:38 +00:00

logo_nan.raw

Initial revision

2002-10-12 11:37:38 +00:00

Makefile

Merged

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

SConscript

Merged

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