svn merge -r41431:41453 ^/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Tue, 1 Nov 2011 23:24:51 +0000 (23:24 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 1 Nov 2011 23:24:51 +0000 (23:24 +0000)
commit9be43762bc70276b1d4f9e722f1498e70c1426c0
tree53f5f6fc07d8d9f9b4a5313d09e6c8f728e9db12
parent85e0609c54f52068ac53435e80dda6d04b1a1373
parent90a19ce57893642263a0b91eed96ba1a710d44af
svn merge -r41431:41453 ^/trunk/blender
build_files/cmake/cmake_consistency_check_config.py
source/blender/blenkernel/intern/smoke.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_api/spacetypes.c
source/blender/makesdna/DNA_userdef_types.h
source/blender/modifiers/intern/MOD_solidify.c