svn merge ^/trunk/blender -r42116:42139
authorCampbell Barton <ideasman42@gmail.com>
Thu, 24 Nov 2011 20:01:45 +0000 (20:01 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 24 Nov 2011 20:01:45 +0000 (20:01 +0000)
commit4b3976cc5a26937724823d07fdcdeb317a4c3948
treea5ef7b8e4959f9b18b66d75f2644ab531d6afcd5
parent45a3acc39838e3ab998b33d4d10e134a7927cd8a
parentd0b7fb5fdf90f09748f94a21e205be7f31ebbb25
svn merge ^/trunk/blender -r42116:42139
release/scripts/startup/bl_ui/properties_data_modifier.py
source/blender/blenkernel/intern/curve.c
source/blender/blenlib/intern/pbvh.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/object/object_add.c
source/blender/editors/space_view3d/view3d_buttons.c
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/rna_scene.c