Tamito Kajiyama d433cd65f7 Merged changes in the trunk up to revision 53146. ...

Conflicts resolved:
release/datafiles/startup.blend
source/blender/blenkernel/CMakeLists.txt
source/blender/blenlib/intern/bpath.c
source/blender/blenloader/intern/readfile.c

2012-12-19 01:49:58 +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

Adding Amharic (i.e. ethiopic) glyphs.

2012-12-18 09:03:21 +00:00

bfont.pfb

Fix #32313: freetype fails to load PFB builtin font

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

bfont.ttf

* Added the bfont TTF itself, along with the source of my changes for lighter

2006-10-12 03:10:14 +00:00

blender_icons16.png

Icons now draw good again!

2012-12-18 19:35:54 +00:00

blender_icons32.png

Icons now draw good again!

2012-12-18 19:35:54 +00:00

blender_icons.sh

commands to convert svg-to-png as shell scripts (just for convenience), and center prvicons.svg so the resulting image is sized properly.

2012-12-14 15:17:53 +00:00

blender_icons.svg

Blender icons now are in the 21st century too!

2012-12-18 15:10:54 +00:00

bmonofont.ttf

2.5: Text Editor back.

2009-02-28 23:33:35 +00:00

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

* Added the bfont TTF itself, along with the source of my changes for lighter

2006-10-12 03:10:14 +00:00

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

prvicons.sh

commands to convert svg-to-png as shell scripts (just for convenience), and center prvicons.svg so the resulting image is sized properly.

2012-12-14 15:17:53 +00:00

prvicons.svg

commands to convert svg-to-png as shell scripts (just for convenience), and center prvicons.svg so the resulting image is sized properly.

2012-12-14 15:17:53 +00:00

splash_template.xcf

Splash template XCF file for Gimp.

2012-12-11 08:01:05 +00:00

splash.png

Splash screen for 2.65, created by Jordan Schur.

2012-12-10 14:01:08 +00:00

startup.blend

set compositor background scale to 1.0

2012-12-16 09:41:39 +00:00