Tamito Kajiyama 329b05dcd7 Merged changes in the trunk up to revision 47381. ...

Conflicts resolved:
source/blender/blenloader/intern/readfile.c

2012-06-03 21:11:10 +00:00

..

bin

Workaround for half-transparent windows when running blender-softwaregl

2011-11-15 07:28:18 +00:00

datafiles

Add skin modifier icon created by Julio Iglesias.

2012-05-22 15:19:13 +00:00

freedesktop

patch to our desktop file from debian, German translation.

2012-04-16 09:56:12 +00:00

scripts

Merged changes in the trunk up to revision 47381.

2012-06-03 21:11:10 +00:00

text

Readme and Release Log Links:

2012-04-05 09:27:53 +00:00

windows

Enable building of the installer with MinGW-w64, patch by Caleb Joseph (Dobz) thanks a lot!

2012-04-25 11:15:55 +00:00

environment-macosx

shapekeys are now stored as customdata in editmode, so edit operations like subdivide work (mostly) correctly. tesselated faces now store correct normals in more situations. and added more missing files from the last merge, there may be more though.

2009-11-02 06:33:16 +00:00

environment-mswindows

set svn end of lines to native

2011-05-09 08:15:38 +00:00

environment-unix

shapekeys are now stored as customdata in editmode, so edit operations like subdivide work (mostly) correctly. tesselated faces now store correct normals in more situations. and added more missing files from the last merge, there may be more though.

2009-11-02 06:33:16 +00:00