Tamito Kajiyama 3b711a6ed0 Merged changes in the trunk up to revision 45133. ...

Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/bmesh/intern/bmesh_construct.c
source/blender/bmesh/intern/bmesh_mesh_conv.c
source/blender/bmesh/intern/bmesh_mesh_conv.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/resources.c
source/blender/editors/mesh/bmesh_select.c
source/blender/editors/mesh/bmesh_tools.c
source/blender/editors/space_view3d/drawobject.c
source/blender/render/intern/source/shadeoutput.c

2012-03-25 08:20:19 +00:00

..

bin

Workaround for half-transparent windows when running blender-softwaregl

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

datafiles

Re-enable the clay strips sculpt brush.

2012-03-18 11:44:14 +00:00

freedesktop

synched with trunk at revision 36569

2011-05-16 20:30:59 +00:00

plugins

svn merge ^/trunk/blender -r42973:42991

2011-12-30 09:23:06 +00:00

scripts

Merged changes in the trunk up to revision 45133.

2012-03-25 08:20:19 +00:00

text

Text fix:

2012-02-21 18:15:28 +00:00

windows

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +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