svn merge ^/trunk/blender -r42839:42871
authorCampbell Barton <ideasman42@gmail.com>
Sun, 25 Dec 2011 21:31:19 +0000 (21:31 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 25 Dec 2011 21:31:19 +0000 (21:31 +0000)
commit2cd5436a81da5c15ac70bd2b80c2f062cce5d02e
tree2cc12476fb3fa653042eef99fa6b5d4d8cb290ec
parent4ced91da47ec1e95d71beef07b218fd0290ff68a
parent02d72b5c076f4ae1b47da74fe7a60a916edad9f2
svn merge ^/trunk/blender -r42839:42871
15 files changed:
CMakeLists.txt
source/blender/blenkernel/BKE_customdata.h
source/blender/blenkernel/intern/customdata.c
source/blender/blenkernel/intern/mesh_validate.c
source/blender/blenkernel/intern/object.c
source/blender/editors/include/ED_view3d.h
source/blender/editors/screen/screen_ops.c
source/blender/makesdna/intern/dna_genfile.c
source/blender/makesrna/intern/rna_scene.c
source/blender/modifiers/intern/MOD_decimate.c
source/blender/modifiers/intern/MOD_edgesplit.c
source/blender/modifiers/intern/MOD_multires.c
source/blender/modifiers/intern/MOD_shrinkwrap.c
source/blender/modifiers/intern/MOD_smooth.c
source/blender/modifiers/intern/MOD_solidify.c