Tamito Kajiyama ed0e2fbd9f Merged changes in the trunk up to revision 52690. ...

Conflicts resolved:
release/datafiles/startup.blend
source/blender/blenlib/intern/bpath.c

2012-12-01 02:47:59 +00:00

..

brushicons

Add new mask-brush icon from Julio Iglesias.

2012-05-10 20:35:12 +00:00

colormanagement

Fix for last color management commit, wrongly assumed aces_to_rec709.spimtx was in svn.

2012-09-25 15:24:06 +00:00

fonts

New i18n font file for Blender, now including Hebrew charset!

2012-09-07 17:59:45 +00:00

bfont.pfb

Fix #32313: freetype fails to load PFB builtin font

2012-08-12 10:03:33 +00:00

bfont.ttf

…

blender_icons.png

Custom icon for triangulate modifier.

2012-11-19 23:35:38 +00:00

bmonofont.ttf

…

ctodata.py

- startup.blend's temp dir was pointing to sergeys user dir, now point to /tmp

2012-04-13 08:18:54 +00:00

datatoc.py

set executable option and some minor changes to ctodata/datatoc

2012-04-13 07:49:59 +00:00

DejaVuSans-Lite.sfd.bz2

…

LICENSE-bfont.ttf.txt

Remove some more $Id$ that still were left after r41227 and r41228.

2011-10-23 19:01:59 +00:00

preview.blend

startup.blend and preview.blend are now converted to C at build time.

2012-08-11 12:26:43 +00:00

prvicons.png

== file browser ==

2012-11-06 20:29:14 +00:00

splash.png

Artifacts on splash are resolved.

2012-10-03 14:16:07 +00:00

startup.blend

Merged changes in the trunk up to revision 52690.

2012-12-01 02:47:59 +00:00