svn merge -r36529:36564 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Mon, 9 May 2011 09:38:48 +0000 (09:38 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 9 May 2011 09:38:48 +0000 (09:38 +0000)
commit5776d7ff9c24edf516616490377678de5ce3d0a1
tree09c91faa6edc0f313aefff5725da10a229a5e9a0
parent9d8a08de559f2339fa084985510bf151ade76a4e
parent4c71d9efb536b53e8f1f5fd4c950d32bfa29b363
svn merge -r36529:36564 https://svn.blender.org/svnroot/bf-blender/trunk/blender
12 files changed:
source/blender/blenlib/intern/math_geom.c
source/blender/editors/space_image/CMakeLists.txt
source/blender/editors/space_image/image_buttons.c
source/blender/editors/space_image/image_ops.c
source/blender/editors/transform/transform_conversions.c
source/blender/makesrna/intern/rna_mesh_api.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_wm_api.c
source/blender/modifiers/intern/MOD_warp.c
source/blender/windowmanager/intern/wm_operators.c
source/gameengine/Converter/BL_BlenderDataConversion.cpp