svn merge -r41371:41420 ^/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Tue, 1 Nov 2011 02:01:09 +0000 (02:01 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 1 Nov 2011 02:01:09 +0000 (02:01 +0000)
commite08c4a00d230d3a09a8f3ab25256100113db36b7
tree3edb6f5efc008c3f8f623d430a9884846651115b
parent1a2188af41b272506e3b58129f178db2172d053f
parenta5959e767e1fce78fa1876e8791667a377ac51f1
svn merge -r41371:41420 ^/trunk/blender
CMakeLists.txt
source/blender/blenkernel/intern/deform.c
source/blender/blenkernel/intern/mesh.c
source/blender/blenlib/BLI_threads.h
source/blender/blenlib/intern/path_util.c
source/blender/blenlib/intern/threads.c
source/blender/editors/mesh/editface.c
source/blender/makesrna/intern/rna_ui_api.c
source/blender/modifiers/intern/MOD_solidify.c