Bastien Montagne 2a7f8d3cb3 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/blenlib/BLI_math_matrix.h
	source/blender/blenlib/intern/math_matrix.c
	source/blender/blenlib/intern/rand.c
	source/blender/editors/animation/anim_channels_edit.c
	source/blender/makesrna/intern/rna_mask.c

2017-11-15 10:46:19 +01:00

..

blender_icons16

UI: Replace placeholder icons in object-add menu

2017-06-10 16:47:21 +02:00

blender_icons32

UI: Replace placeholder icons in object-add menu

2017-06-10 16:47:21 +02:00

brushicons

add brush icons from paint branch to make diff more manageable for arcanist

2014-06-22 17:48:08 +03:00

colormanagement

Usual i18n/UI messages fixes.

2017-06-16 12:50:24 +02:00

fonts

UI Font: Fix bad kerning of Thai font.

2016-06-11 10:47:53 +02:00

locale @ b3d9c97f48

Fix T53309: Remove default 'Clear loc/rot/scale delta transform' shortcuts.

2017-11-14 22:51:44 +01:00

matcaps

Release todo: added userpref for Mac users having "Natural Scroll" set.

2013-02-08 12:12:57 +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_icons_update.py

Icons: make inkscape svg to png conversion work with Inkscape.app on OS X.

2014-01-17 16:50:11 +01:00

blender_icons.svg

UI: Replace placeholder icons in object-add menu

2017-06-10 16:47:21 +02:00

bmonofont.ttf

2.5: Text Editor back.

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

ctodata.py

Call to python3 for stand-alone scripts

2016-07-26 05:18:00 +10: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

LICENSE-bmonofont-i18n.ttf.txt

Add a license document for i18n monospace font.

2013-03-20 13:02:40 +00:00

LICENSE-droidsans.ttf.txt

UI Font: Fix bad kerning of Thai font.

2016-06-11 10:47:53 +02:00

preview_cycles.blend

Fix material preview for Cycles and BI

2017-04-26 14:37:18 +02:00

preview.blend

Fix material preview for Cycles and BI

2017-04-26 14:37:18 +02:00

prvicons_update.py

Fix preview icons update script to work in OSX

2014-08-31 01:17:45 +02:00

prvicons.png

Icons: Fix small alignment and shadow issue in prvicons. Add missing copyright notice.

2016-08-21 19:10:02 +02:00

prvicons.svg

Icons: Fix small alignment and shadow issue in prvicons. Add missing copyright notice.

2016-08-21 19:10:02 +02:00

splash_2x.png

First development splash screen for Blender 2.8

2017-09-21 20:30:28 +02:00

splash_scale.sh

Add script which scales splash screen down

2016-09-06 12:27:58 +02:00

splash_template.xcf

Blender 2.78 commit!

2016-09-02 11:37:25 +02:00

splash.png

First development splash screen for Blender 2.8

2017-09-21 20:30:28 +02:00

startup.blend

startup.blend, update movie-tracking layout T41660

2014-12-10 16:49:00 +01:00

workspaces.blend

Main Workspace Integration

2017-06-01 19:59:37 +02:00