svn merge -r36725:36801 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Fri, 20 May 2011 16:52:10 +0000 (16:52 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 20 May 2011 16:52:10 +0000 (16:52 +0000)
commit88f4087a574c2f74b3414d47dab8be97cce4bc84
treef1440d4aa18d73c4d1449857ccabefc444d867e2
parent4514be8f4ff5c87824e447c7016939363f66f78c
parent259582235c5dc211f998e2c1924faae6c9b7a87e
svn merge -r36725:36801 https://svn.blender.org/svnroot/bf-blender/trunk/blender
42 files changed:
source/blender/blenkernel/BKE_subsurf.h
source/blender/blenkernel/intern/blender.c
source/blender/blenkernel/intern/multires.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/shrinkwrap.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenlib/BLI_math_geom.h
source/blender/blenlib/BLI_utildefines.h
source/blender/blenlib/intern/math_geom.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/armature/editarmature.c
source/blender/editors/curve/editcurve.c
source/blender/editors/gpencil/gpencil_paint.c
source/blender/editors/include/ED_view3d.h
source/blender/editors/mesh/editbmesh_bvh.c
source/blender/editors/mesh/knifetool.c
source/blender/editors/physics/particle_edit.c
source/blender/editors/render/CMakeLists.txt
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/paint_utils.c
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/space_image/space_image.c
source/blender/editors/space_view3d/drawmesh.c
source/blender/editors/space_view3d/space_view3d.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/editors/space_view3d/view3d_view.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/transform/transform_manipulator.c
source/blender/editors/transform/transform_snap.c
source/blender/editors/uvedit/uvedit_ops.c
source/blender/makesrna/intern/rna_scene.c
source/blender/modifiers/intern/MOD_subsurf.c
source/blender/modifiers/intern/MOD_uvproject.c
source/blender/windowmanager/intern/wm_init_exit.c
source/gameengine/Converter/BL_BlenderDataConversion.cpp