svn merge -r36529:36564 https://svn.blender.org/svnroot/bf-blender/trunk/blender

diff --cc source/blender/blenlib/intern/math_geom.c
Simple merge

diff --cc source/blender/editors/space_image/CMakeLists.txt
Simple merge

diff --cc source/blender/editors/space_image/image_buttons.c
Simple merge

diff --cc source/blender/editors/space_image/image_ops.c
Simple merge

diff --cc source/blender/editors/transform/transform_conversions.c
Simple merge

diff --cc source/blender/makesrna/intern/rna_mesh_api.c
index d237664df0f515f3721a600373202b5f0805c3cc,87bbea334dba37962c31581040417ca311f00446..690f872f84c7692f9e94026e05f45d12dbfd1fba
--- 1/source/blender/makesrna/intern/rna_mesh_api.c
--- 2/source/blender/makesrna/intern/rna_mesh_api.c
+++ b/source/blender/makesrna/intern/rna_mesh_api.c
@@@ -71,16 -63,9 +71,16 @@@ void RNA_api_mesh(StructRNA *srna
        RNA_def_boolean(func, "calc_edges", 0, "Calculate Edges", "Force recalculation of edges.");
        RNA_def_function_flag(func, FUNC_USE_CONTEXT);
  
 +      func= RNA_def_function(srna, "unit_test_compare", "rna_Mesh_unit_test_compare");
 +      parm= RNA_def_pointer(func, "mesh", "Mesh", "", "Mesh to compare to");
 +      RNA_def_function_flag(func, FUNC_USE_CONTEXT);
 +      /* return value */
 +      parm= RNA_def_string(func, "result", "nothing", 64, "Return value", "String description of result of comparison");
 +      RNA_def_function_return(func, parm);
 +
        func= RNA_def_function(srna, "validate", "BKE_mesh_validate");
        RNA_def_function_ui_description(func, "validate geometry, return True when the mesh has had invalid geometry corrected/removed.");
-       parm= RNA_def_boolean(func, "verbose", 0, "Verbose", "Output information about the errors found");
+       RNA_def_boolean(func, "verbose", 0, "Verbose", "Output information about the errors found");
        parm= RNA_def_boolean(func, "result", 0, "Result", "");
        RNA_def_function_return(func, parm);
  }

diff --cc source/blender/makesrna/intern/rna_modifier.c
Simple merge

diff --cc source/blender/makesrna/intern/rna_scene.c
Simple merge

diff --cc source/blender/makesrna/intern/rna_wm_api.c
Simple merge

diff --cc source/blender/modifiers/intern/MOD_warp.c
Simple merge

diff --cc source/blender/windowmanager/intern/wm_operators.c
Simple merge

diff --cc source/gameengine/Converter/BL_BlenderDataConversion.cpp
Simple merge