svn merge -r39664:39762 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Mon, 29 Aug 2011 00:46:56 +0000 (00:46 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 29 Aug 2011 00:46:56 +0000 (00:46 +0000)
commit5065d4c744085a32fe8511515909da0b4bf2fb3d
tree19da9a2ba799560ffe95c5e5a64269587d3a049d
parentff7bde2a2f2e20600460e96dc9181330d08ed0ba
parentf71223400929b55720251eabd46732397f34a7b1
svn merge -r39664:39762 https://svn.blender.org/svnroot/bf-blender/trunk/blender
27 files changed:
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/mesh_validate.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/particle.c
source/blender/blenlib/BLI_math_vector.h
source/blender/blenlib/BLI_utildefines.h
source/blender/blenlib/intern/BLI_ghash.c
source/blender/blenlib/intern/callbacks.c
source/blender/blenlib/intern/math_vector_inline.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/armature/editarmature.c
source/blender/editors/include/ED_view3d.h
source/blender/editors/object/object_modifier.c
source/blender/editors/physics/particle_edit.c
source/blender/editors/render/render_shading.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/editors/space_view3d/view3d_view.c
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/render/intern/source/convertblender.c
source/blender/windowmanager/intern/wm_init_exit.c
source/gameengine/Converter/BL_BlenderDataConversion.cpp