svn merge ^/trunk/blender -r42080:42095
authorCampbell Barton <ideasman42@gmail.com>
Wed, 23 Nov 2011 17:14:27 +0000 (17:14 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 23 Nov 2011 17:14:27 +0000 (17:14 +0000)
commit74c6c91ba65d40b103234feb2f3ef254b0335193
tree1927b26ca8881ee2344d95e475381d89da2b8ac4
parentf850e76e0438c5e0e1ed1b8606fee93ea0775747
parenta91bd43d382b857abb4440fe5a2353a4fac0519d
svn merge ^/trunk/blender -r42080:42095
13 files changed:
source/blender/blenkernel/intern/object.c
source/blender/editors/include/ED_mesh.h
source/blender/editors/include/ED_object.h
source/blender/editors/include/ED_view3d.h
source/blender/editors/object/object_modifier.c
source/blender/editors/object/object_relations.c
source/blender/editors/object/object_vgroup.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_scene.c
source/blender/modifiers/intern/MOD_weightvgproximity.c
source/blenderplayer/bad_level_call_stubs/stubs.c