svn merge ^/trunk/blender -r43530:43554
authorCampbell Barton <ideasman42@gmail.com>
Fri, 20 Jan 2012 12:34:00 +0000 (12:34 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 20 Jan 2012 12:34:00 +0000 (12:34 +0000)
commitc8037fb56ae31f4edfdb4a0b1832a299e411e133
tree4186b7de996464946792e9ce9dfabe0659c5ebf8
parentc5adacff83e9d1c4a849ec80d05e7e988436df69
parentf0fc8c22bb9f8fa4cab232fd88b9aed27ca6637f
svn merge ^/trunk/blender -r43530:43554
release/scripts/startup/bl_ui/properties_data_modifier.py
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/editors/include/ED_mesh.h
source/blender/editors/mesh/mesh_data.c
source/blender/editors/object/object_bake.c
source/blender/editors/uvedit/uvedit_smart_stitch.c
source/blender/makesrna/intern/rna_mesh.c
source/blenderplayer/bad_level_call_stubs/stubs.c