Joseph Eagar dae0b7a4a2 fix merge bug, this should fix this issue for now, but might need further work later.

2009-09-04 01:28:06 +00:00

..

intern

fix merge bug, this should fix this issue for now, but might need further work later.

2009-09-04 01:28:06 +00:00

BLI_arithb.h

merge with 2.5 at r22793

2009-08-26 10:27:04 +00:00

BLI_blenlib.h

Bugfix #18637

2009-04-28 17:25:50 +00:00

BLI_boxpack2d.h

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

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

BLI_bpath.h

* Group unlinking wasnt removing groups from particle systems, or render layers light overrid.

2008-04-27 20:43:25 +00:00

BLI_dlrbTree.h

SVN maintenance.

2009-07-18 23:12:42 +00:00

BLI_dynamiclist.h

2.5

2009-01-17 14:56:12 +00:00

BLI_dynstr.h

2.5: Error reporting

2008-12-29 13:38:08 +00:00

BLI_edgehash.h

Fix for bug #11140: explode modifier could run out of memory quite

2008-05-12 11:48:55 +00:00

BLI_editVert.h

merge with 2.5 at r21568

2009-07-16 06:27:37 +00:00

BLI_fileops.h

- Support for importing python packages. (directories of python scripts containing an __init__.py)

2009-07-19 17:45:14 +00:00

BLI_fnmatch.h

Bugfix #7510: Doesn't save .blend file name with [

2007-11-19 20:13:14 +00:00

BLI_ghash.h

gHash iterator initializer

2008-05-27 13:22:17 +00:00

BLI_graph.h

Cosmetic changes in etch-a-ton drawing code, mostly.

2009-07-09 01:48:08 +00:00

BLI_gsqueue.h

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

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

BLI_heap.h

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

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

BLI_jitter.h

Filling in branch from trunk

2007-11-06 22:29:20 +00:00

BLI_kdopbvh.h

* First commit merging 2.4-based sim_physics in to volume25 branch.

2009-08-13 05:21:25 +00:00

BLI_kdtree.h

2.5:

2009-07-25 22:20:26 +00:00

BLI_linklist.h

2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17434:HEAD

2008-12-14 17:32:24 +00:00

BLI_listbase.h

SVN maintenance.

2009-06-23 00:09:26 +00:00

BLI_memarena.h

2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17434:HEAD

2008-12-14 17:32:24 +00:00

BLI_mempool.h

There was a problem with the last merge :S

2008-07-15 12:54:57 +00:00

BLI_noise.h

SVN maintenance.

2009-06-23 00:09:26 +00:00

BLI_rand.h

svn merge -r 16077:16174 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2008-08-18 14:33:26 +00:00

BLI_rect.h

SVN maintenance.

2009-06-23 00:09:26 +00:00

BLI_scanfill.h

2.5 BLI_blenlib cleanup

2008-12-20 10:02:00 +00:00

BLI_storage_types.h

2.5 file browser

2009-07-26 18:52:27 +00:00

BLI_storage.h

2.5: warning fixes

2009-06-22 18:19:18 +00:00

BLI_string.h

SVN maintenance.

2009-06-23 00:09:26 +00:00

BLI_threads.h

2.5

2009-06-08 10:00:14 +00:00

BLI_util.h

BLI_setenv, use instead of copying ifdefs about for setting env vars.

2009-07-21 09:26:28 +00:00

BLI_vfontdata.h

remove own postscript font loading code (rely on freetype now)

2009-08-01 22:33:18 +00:00

BLI_voxel.h

2.5 - Warning cleanups (for mingw+scons)

2009-08-26 00:38:43 +00:00

BLI_winstuff.h

Smoke:

2009-08-20 00:33:59 +00:00

CMakeLists.txt

- remove UNSET becuase it only works with newer versions of cmake,

2009-08-15 13:30:28 +00:00

Makefile

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

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

MTC_matrixops.h

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

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

MTC_vectorops.h

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

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

PIL_dynlib.h

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

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

PIL_time.h

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

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

SConscript

cmake option to disable SDL,

2009-07-20 10:24:53 +00:00