svn merge ^/trunk/blender -r41005:41075
authorCampbell Barton <ideasman42@gmail.com>
Mon, 17 Oct 2011 03:40:10 +0000 (03:40 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 17 Oct 2011 03:40:10 +0000 (03:40 +0000)
commitef1a1e14511db251793e9f92572817986c048696
tree9e1608b070478aa8f63614d6e6fbd9dd7b52ff91
parent19b3f13a84da22b4c63fd10d9fba11d7dfb6eef8
parent67c15da97de7644fc4deb3ab1b03c3db22f1f647
svn merge ^/trunk/blender -r41005:41075
17 files changed:
build_files/cmake/cmake_consistency_check_config.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/BKE_paint.h
source/blender/blenkernel/intern/anim.c
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenlib/intern/path_util.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/transform/transform.c
source/blender/editors/util/crazyspace.c
source/blender/makesrna/intern/rna_scene.c
source/creator/CMakeLists.txt