svn merge ^/trunk/blender -r41602:41638 .
authorCampbell Barton <ideasman42@gmail.com>
Tue, 8 Nov 2011 02:57:28 +0000 (02:57 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 8 Nov 2011 02:57:28 +0000 (02:57 +0000)
commitcb890a49fbd653c71d2fe639265a1a562136113f
tree10ddd1f7198c85408f83794fe560caa9512e2a2e
parentaea95c78606a99b0fa9c4c29c9e922e4a03f2a69
parentf086201518b85f6dd2ae60ae37dc14f1d1406c01
svn merge ^/trunk/blender -r41602:41638 .
35 files changed:
CMakeLists.txt
release/scripts/startup/bl_ui/space_view3d.py
source/blender/CMakeLists.txt
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/object.c
source/blender/blenlib/BLI_threads.h
source/blender/blenlib/intern/threads.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/include/ED_view3d.h
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_api/spacetypes.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/space_view3d.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/editors/space_view3d/view3d_snap.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform.h
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_generics.c
source/blender/editors/util/CMakeLists.txt
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_ui_api.c
source/blenderplayer/CMakeLists.txt
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/CMakeLists.txt
source/creator/creator.c