svn merge ^/trunk/blender -r42245:42261

diff --cc source/blender/blenkernel/BKE_bmesh.h
Simple merge

diff --cc source/blender/blenkernel/intern/BME_Customdata.c
Simple merge

diff --cc source/blender/blenlib/intern/scanfill.c
index 920e19891177deb120488e7e44885d8f37c05bd4,41b1fea32a6e9af83cda41803c94f074bfd4af74..04f83dd351efbcb123e14b68e9b43edb0696c396
--- 1/source/blender/blenlib/intern/scanfill.c
--- 2/source/blender/blenlib/intern/scanfill.c
+++ b/source/blender/blenlib/intern/scanfill.c
@@@ -705,8 -687,8 +705,8 @@@ static int scanfill(PolyFill *pf, shor
                                        ed1->v2->f= 0;
                                        ed1->v1->h--; 
                                        ed1->v2->h--;
 -                                      /* ed2 can be removed when it's an old one */
 -                                      if(ed2->f==0 && twoconnected) {
 +                                      /* ed2 can be removed when it's a boundary edge */
-                                       if(ed2->f==0 && twoconnected || ed2->f==FILLBOUNDARY) {
++                                      if((ed2->f == 0 && twoconnected) || (ed2->f == FILLBOUNDARY)) {
                                                BLI_remlink((ListBase *)&(sc->first),ed2);
                                                BLI_addtail(&filledgebase,ed2);
                                                ed2->v2->f= 0;

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

diff --cc source/blender/editors/object/object_bake.c
Simple merge

diff --cc source/blender/gpu/intern/gpu_buffers.c
Simple merge

diff --cc source/blender/modifiers/MOD_modifiertypes.h
Simple merge

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

diff --cc source/blender/modifiers/intern/MOD_util.h
Simple merge

diff --cc source/blender/render/intern/source/convertblender.c
Simple merge