svn merge ^/trunk/blender -r43294:43338

5 files changed, 15 insertions, 18 deletions

diff --git a/source/blender/blenlib/BLI_editVert.h b/source/blender/blenlib/BLI_editVert.h
index 3f20187dee1..fa0c0746f66 100644
--- a/source/blender/blenlib/BLI_editVert.h
+++ b/source/blender/blenlib/BLI_editVert.h
@@ -42,7 +42,6 @@
 #include "BLO_sys_types.h" // for intptr_t support
 
 struct DerivedMesh;
-struct RetopoPaintData;
 struct BLI_mempool;
 
 /* note; changing this also might affect the undo copy in editmesh.c */
@@ -187,8 +186,6 @@ typedef struct EditMesh
 	 */
 	int lastDataMask;
 
-	struct RetopoPaintData *retopo_paint_data;
-
 	CustomData vdata, edata, fdata;
 
 } EditMesh;
diff --git a/source/blender/blenlib/BLI_fnmatch.h b/source/blender/blenlib/BLI_fnmatch.h
index c09a7c7c0d2..ac8960ff9c9 100644
--- a/source/blender/blenlib/BLI_fnmatch.h
+++ b/source/blender/blenlib/BLI_fnmatch.h
@@ -51,7 +51,7 @@ extern "C" {
 #define	FNM_NOESCAPE	(1 << 1) /* Backslashes don't quote special chars.  */
 #define	FNM_PERIOD	(1 << 2) /* Leading `.' is matched only explicitly.  */
 	
-#if !defined (_POSIX_C_SOURCE) || _POSIX_C_SOURCE < 2 || defined (_GNU_SOURCE)
+#if !defined (_POSIX_C_SOURCE) || _POSIX_C_SOURCE < 2 || defined (_GNU_SOURCE) || defined( __SUNPRO_C)
 #define	FNM_FILE_NAME	FNM_PATHNAME /* Preferred GNU name.  */
 #define	FNM_LEADING_DIR	(1 << 3) /* Ignore `/...' after a match.  */
 #define	FNM_CASEFOLD	(1 << 4) /* Compare without regard to case.  */
diff --git a/source/blender/blenlib/intern/boxpack2d.c b/source/blender/blenlib/intern/boxpack2d.c
index 30bf69ba3b4..073b4b5d0c6 100644
--- a/source/blender/blenlib/intern/boxpack2d.c
+++ b/source/blender/blenlib/intern/boxpack2d.c
@@ -174,33 +174,33 @@ void boxPack2D(boxPack *boxarray, const int len, float *tot_width, float *tot_he
 	
 	for (box=boxarray, box_index=0, i=0; box_index < len; box_index++, box++) {
 
-		vert->blb = vert->brb = vert->tlb =\
-			vert->isect_cache[0] = vert->isect_cache[1] =\
-			vert->isect_cache[2] = vert->isect_cache[3] = NULL;
+		vert->blb = vert->brb = vert->tlb =
+		        vert->isect_cache[0] = vert->isect_cache[1] =
+		        vert->isect_cache[2] = vert->isect_cache[3] = NULL;
 		vert->free = CORNERFLAGS &~ TRF;
 		vert->trb = box;
 		vert->index = i; i++;
 		box->v[BL] = vert; vert++;
 		
-		vert->trb= vert->brb = vert->tlb =\
-			vert->isect_cache[0] = vert->isect_cache[1] =\
-			vert->isect_cache[2] = vert->isect_cache[3] = NULL;
+		vert->trb= vert->brb = vert->tlb =
+		        vert->isect_cache[0] = vert->isect_cache[1] =
+		        vert->isect_cache[2] = vert->isect_cache[3] = NULL;
 		vert->free = CORNERFLAGS &~ BLF;
 		vert->blb = box;
 		vert->index = i; i++;
 		box->v[TR] = vert; vert++;
 		
-		vert->trb = vert->blb = vert->tlb =\
-			vert->isect_cache[0] = vert->isect_cache[1] =\
-			vert->isect_cache[2] = vert->isect_cache[3] = NULL;
+		vert->trb = vert->blb = vert->tlb =
+		        vert->isect_cache[0] = vert->isect_cache[1] =
+		        vert->isect_cache[2] = vert->isect_cache[3] = NULL;
 		vert->free = CORNERFLAGS &~ BRF;
 		vert->brb = box;
 		vert->index = i; i++;
 		box->v[TL] = vert; vert++;
 		
-		vert->trb = vert->blb = vert->brb =\
-			vert->isect_cache[0] = vert->isect_cache[1] =\
-			vert->isect_cache[2] = vert->isect_cache[3] = NULL;
+		vert->trb = vert->blb = vert->brb =
+		        vert->isect_cache[0] = vert->isect_cache[1] =
+		        vert->isect_cache[2] = vert->isect_cache[3] = NULL;
 		vert->free = CORNERFLAGS &~ TLF;
 		vert->tlb = box; 
 		vert->index = i; i++;
diff --git a/source/blender/blenlib/intern/fileops.c b/source/blender/blenlib/intern/fileops.c
index 95b6a970b49..ad0478060f2 100644
--- a/source/blender/blenlib/intern/fileops.c
+++ b/source/blender/blenlib/intern/fileops.c
@@ -82,7 +82,7 @@ int BLI_file_gzip(const char *from, const char *to)
 		return -2;
 
 	while(1) {
-		readsize = read(file, buffer, 10240);
+		readsize = read(file, buffer, sizeof(buffer));
 
 		if(readsize < 0) {
 			rval= -2; /* error happened in reading */
diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c
index 6d631051496..bbdb9bc5823 100644
--- a/source/blender/blenlib/intern/path_util.c
+++ b/source/blender/blenlib/intern/path_util.c
@@ -52,7 +52,7 @@
 
 #include "GHOST_Path-api.h"
 
-#if defined WIN32 && !defined _LIBC
+#if defined WIN32 && !defined _LIBC  || defined __sun
 #  include "BLI_fnmatch.h" /* use fnmatch included in blenlib */
 #else
 #  ifndef _GNU_SOURCE