Tamito Kajiyama e91f33101f Merged changes in the trunk up to revision 50956. ...

Conflicts resolved:
source/blender/editors/interface/resources.c

2012-09-30 13:16:55 +00:00

..

bin

Workaround for half-transparent windows when running blender-softwaregl

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

datafiles

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

2012-09-25 15:24:06 +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 50956.

2012-09-30 13:16:55 +00:00

text

Merged changes in the trunk up to revision 50829.

2012-09-23 18:50:56 +00:00

windows

style cleanup

2012-09-30 06:12:47 +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