Merged changes in the trunk up to revision 55700.

Conflicts resolved:
source/blender/editors/mesh/mesh_intern.h

4 files changed, 23 insertions, 13 deletions

diff --git a/source/blender/blenloader/BLO_sys_types.h b/source/blender/blenloader/BLO_sys_types.h
index 4e76481c394..73434259432 100644
--- a/source/blender/blenloader/BLO_sys_types.h
+++ b/source/blender/blenloader/BLO_sys_types.h
@@ -100,10 +100,6 @@ typedef uint64_t u_int64_t;
 #include <inttypes.h>
 
 #elif defined(FREE_WINDOWS)
-#ifndef FREE_WINDOWS64
-/* define htoln here, there must be a syntax error in winsock2.h in MinGW */
-unsigned long __attribute__((__stdcall__)) htonl(unsigned long);
-#endif
 #include <stdint.h>
 
 #else
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index a6dc4d242e9..b727aae64dd 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -6364,7 +6364,6 @@ static void direct_link_screen(FileData *fd, bScreen *sc)
 				
 				sclip->scopes.track_search = NULL;
 				sclip->scopes.track_preview = NULL;
-				sclip->draw_context = NULL;
 				sclip->scopes.ok = 0;
 			}
 		}
@@ -8127,7 +8126,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 						if (ba->axis==(float) 'x') ba->axis=OB_POSX;
 						else if (ba->axis==(float)'y') ba->axis=OB_POSY;
 						/* don't do an if/else to avoid imediate subversion bump*/
-//					ba->axis=((ba->axis == (float) 'x')?OB_POSX_X:OB_POSY);
+//						ba->axis=((ba->axis == (float)'x') ? OB_POSX_X : OB_POSY);
 					}
 				}
 			}
@@ -9269,7 +9268,18 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 	}
 
 	if (main->versionfile < 267) {
-		
+		//if(!DNA_struct_elem_find(fd->filesdna, "Brush", "int", "stencil_pos")) {
+		Brush *brush;
+
+		for (brush = main->brush.first; brush; brush = brush->id.next) {
+			if (brush->stencil_dimension[0] == 0) {
+				brush->stencil_dimension[0] = 256;
+				brush->stencil_dimension[1] = 256;
+				brush->stencil_pos[0] = 256;
+				brush->stencil_pos[1] = 256;
+			}
+		}
+
 		/* TIP: to initialize new variables added, use the new function
 		   DNA_struct_elem_find(fd->filesdna, "structname", "typename", "varname")
 		   example: 
diff --git a/source/blender/blenloader/intern/versioning_250.c b/source/blender/blenloader/intern/versioning_250.c
index c00569e4b51..2445775ad44 100644
--- a/source/blender/blenloader/intern/versioning_250.c
+++ b/source/blender/blenloader/intern/versioning_250.c
@@ -1070,7 +1070,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *main)
 			sce->gm.dome.warptext = sce->r.dometext;
 
 			/* Stand Alone */
-			sce->gm.playerflag |= (sce->r.fullscreen?GAME_PLAYER_FULLSCREEN:0);
+			sce->gm.playerflag |= (sce->r.fullscreen ? GAME_PLAYER_FULLSCREEN : 0);
 			sce->gm.xplay = sce->r.xplay;
 			sce->gm.yplay = sce->r.yplay;
 			sce->gm.freqplay = sce->r.freqplay;
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index e8426c58324..011f9df6f8c 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -801,9 +801,9 @@ static void current_screen_compat(Main *mainvar, bScreen **screen)
 
 	/* find a global current screen in the first open window, to have
 	 * a reasonable default for reading in older versions */
-	wm= mainvar->wm.first;
-	window= (wm)? wm->windows.first: NULL;
-	*screen= (window)? window->screen: NULL;
+	wm = mainvar->wm.first;
+	window = (wm) ? wm->windows.first : NULL;
+	*screen = (window) ? window->screen : NULL;
 }
 
 typedef struct RenderInfo {
@@ -3225,7 +3225,7 @@ static void write_global(WriteData *wd, int fileflags, Main *mainvar)
 
 	/* XXX still remap G */
 	fg.curscreen= screen;
-	fg.curscene= screen? screen->scene : NULL;
+	fg.curscene= screen ? screen->scene : NULL;
 	fg.displaymode= G.displaymode;
 	fg.winpos= G.winpos;
 
@@ -3286,7 +3286,11 @@ static int write_file_handle(Main *mainvar, int handle, MemFile *compare, MemFil
 	}
 #endif
 
-	sprintf(buf, "BLENDER%c%c%.3d", (sizeof(void*)==8)?'-':'_', (ENDIAN_ORDER==B_ENDIAN)?'V':'v', BLENDER_VERSION);
+	sprintf(buf, "BLENDER%c%c%.3d",
+	        (sizeof(void *) == 8)      ? '-' : '_',
+	        (ENDIAN_ORDER == B_ENDIAN) ? 'V' : 'v',
+	        BLENDER_VERSION);
+
 	mywrite(wd, buf, 12);
 
 	write_renderinfo(wd, mainvar);