svn merge -r41458:41480 ^/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Wed, 2 Nov 2011 23:16:10 +0000 (23:16 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 2 Nov 2011 23:16:10 +0000 (23:16 +0000)
commit5fbf3b813cd5473070f3c3bd6572ad504b83dc74
treef9cb28d79cf31d8ea85014ef5d70c80190fb3333
parent439f57d361322bbe521cfd3e60dfd6534ca22c6d
parent4293f4738ce0ea1bb81260b12a6b64f98b6a3468
svn merge -r41458:41480 ^/trunk/blender
17 files changed:
CMakeLists.txt
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/object.c
source/blender/blenlib/CMakeLists.txt
source/blender/blenlib/intern/path_util.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/object/object_add.c
source/blender/editors/object/object_edit.c
source/blender/editors/render/render_shading.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/space_view3d.c
source/blender/makesdna/DNA_object_types.h
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_scene.c
source/blenderplayer/bad_level_call_stubs/stubs.c