svn merge ^/trunk/blender -r41503:41575
authorCampbell Barton <ideasman42@gmail.com>
Sun, 6 Nov 2011 10:38:44 +0000 (10:38 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 6 Nov 2011 10:38:44 +0000 (10:38 +0000)
commite936c78251de5bafa99439803ab4fd2caa4df3b2
tree51ccdc2efbab74903cb7b428619726832c3b1ab4
parent735ab2b22d865570a4585e7088e66a45030ddf2d
parentb18e661ffcd39b97ac0c8295d778a1cb31339ed8
svn merge ^/trunk/blender -r41503:41575
40 files changed:
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/anim.c
source/blender/blenkernel/intern/blender.c
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/key.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/particle.c
source/blender/blenlib/intern/pbvh.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/armature/editarmature.c
source/blender/editors/curve/editcurve.c
source/blender/editors/include/ED_view3d.h
source/blender/editors/object/object_add.c
source/blender/editors/object/object_bake.c
source/blender/editors/object/object_edit.c
source/blender/editors/object/object_relations.c
source/blender/editors/object/object_transform.c
source/blender/editors/physics/particle_edit.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/space_view3d.c
source/blender/editors/space_view3d/view3d_header.c
source/blender/editors/space_view3d/view3d_view.c
source/blender/editors/transform/transform.c
source/blender/editors/util/editmode_undo.c
source/blender/gpu/intern/gpu_buffers.c
source/blender/imbuf/intern/moviecache.c
source/blender/makesdna/DNA_object_types.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_object.c
source/blender/modifiers/intern/MOD_build.c
source/blender/modifiers/intern/MOD_explode.c
source/blender/modifiers/intern/MOD_uvproject.c
source/blender/windowmanager/intern/wm_init_exit.c
source/creator/creator.c
source/gameengine/Converter/BL_BlenderDataConversion.cpp