Merged 37865-38124

diff --cc CMakeLists.txt
Simple merge

diff --cc build_files/cmake/macros.cmake
Simple merge

diff --cc build_files/scons/config/win32-vc-config.py
Simple merge

diff --cc build_files/scons/config/win64-vc-config.py
Simple merge

diff --cc doc/python_api/sphinx_doc_gen.py
Simple merge

diff --cc release/scripts/startup/bl_ui/properties_data_mesh.py
Simple merge

diff --cc release/scripts/startup/bl_ui/properties_material.py
Simple merge

diff --cc source/blender/blenlib/BLI_math_geom.h
index b34b9c4b70f27d99ba887e21ecb689a206da421e,506e271071cc7f8ba1a2558ca70fa2f3bb8f1d7b..fe588d5caa6bc28a354fb049ed0b09eaa57f3f77
--- 1/source/blender/blenlib/BLI_math_geom.h
--- 2/source/blender/blenlib/BLI_math_geom.h
+++ b/source/blender/blenlib/BLI_math_geom.h
@@@ -66,6 -66,9 +66,8 @@@ float closest_to_line_v3(float r[3], co
  float closest_to_line_v2(float r[2], const float p[2], const float l1[2], const float l2[2]);
  void closest_to_line_segment_v3(float r[3], const float p[3], const float l1[3], const float l2[3]);
  
 -
+ float line_point_factor_v3(const float p[3], const float l1[3], const float l2[3]);
+ float line_point_factor_v2(const float p[2], const float l1[2], const float l2[2]);
  /******************************* Intersection ********************************/
  
  /* TODO int return value consistency */

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

diff --cc source/blender/editors/armature/armature_ops.c
Simple merge

diff --cc source/blender/makesdna/DNA_scene_types.h
Simple merge

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

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

diff --cc source/blender/python/generic/mathutils_geometry.c
Simple merge

diff --cc source/blender/render/intern/source/pipeline.c
index 1d112341218006ccf1ef4bcdc950fd807d7b6fac,b9006b390ab24433012601de0f93e869a0bb9bd1..de74938b6710036d00e348e5958e2b7b04eff243
--- 1/source/blender/render/intern/source/pipeline.c
--- 2/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@@ -2927,9 -2938,11 +2934,9 @@@ void RE_BlenderFrame(Render *re, Main *
                                BKE_makepicstring(name, scene->r.pic, scene->r.cfra, scene->r.imtype, scene->r.scemode & R_EXTENSION, FALSE);
        
                                /* reports only used for Movie */
-                               do_write_image_or_movie(re, scene, NULL, NULL, name);
+                               do_write_image_or_movie(re, scene, NULL, name);
                        }
                }
 -
 -              BLI_exec_cb(re->main, (ID *)scene, BLI_CB_EVT_RENDER_POST); /* keep after file save */
        }
  
        /* UGLY WARNING */
@@@ -3056,17 -3069,24 +3063,17 @@@ void RE_BlenderAnim(Render *re, Main *b
  
        if (mh->get_next_frame) {
                while (!(G.afbreek == 1)) {
-                       int nf = mh->get_next_frame(&re->r, reports);
+                       int nf = mh->get_next_frame(&re->r, re->reports);
                        if (nf >= 0 && nf >= scene->r.sfra && nf <= scene->r.efra) {
                                scene->r.cfra = re->r.cfra = nf;
 -
 -                              BLI_exec_cb(re->main, (ID *)scene, BLI_CB_EVT_RENDER_PRE);
 -
 +                              
                                do_render_all_options(re);
  
                                if(re->test_break(re->tbh) == 0) {
-                                       if(!do_write_image_or_movie(re, scene, mh, reports, NULL))
+                                       if(!do_write_image_or_movie(re, scene, mh, NULL))
                                                G.afbreek= 1;
                                }
 -
 -                              if(G.afbreek == 0) {
 -                                      BLI_exec_cb(re->main, (ID *)scene, BLI_CB_EVT_RENDER_POST); /* keep after file save */
 -                              }
 -                      }
 -                      else {
 +                      } else {
                                if(re->test_break(re->tbh))
                                        G.afbreek= 1;
                        }

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

diff --cc source/creator/creator.c
Simple merge