Merged changes in the trunk up to revision 51126.

Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/windowmanager/WM_types.h

8 files changed, 30 insertions, 26 deletions

diff --git a/source/blender/blenlib/BLI_fileops.h b/source/blender/blenlib/BLI_fileops.h
index e8d6336a994..c278370d211 100644
--- a/source/blender/blenlib/BLI_fileops.h
+++ b/source/blender/blenlib/BLI_fileops.h
@@ -96,6 +96,8 @@ void   BLI_file_free_lines(struct LinkNode *lines);
 #  ifndef O_BINARY
 #    define O_BINARY 0
 #  endif
+#else
+void BLI_get_short_name(char short_name[256], const char *filename);
 #endif
 
 #ifdef __cplusplus
diff --git a/source/blender/blenlib/BLI_lasso.h b/source/blender/blenlib/BLI_lasso.h
index 85a000b000c..a7e90a51e86 100644
--- a/source/blender/blenlib/BLI_lasso.h
+++ b/source/blender/blenlib/BLI_lasso.h
@@ -34,8 +34,8 @@
 
 struct rcti;
 
-void BLI_lasso_boundbox(struct rcti *rect, int mcords[][2], short moves);
-int  BLI_lasso_is_point_inside(int mcords[][2], short moves, const int sx, const int sy, const int error_value);
-int  BLI_lasso_is_edge_inside(int mcords[][2], short moves, int x0, int y0, int x1, int y1, const int error_value);
+void BLI_lasso_boundbox(struct rcti *rect, const int mcords[][2], const short moves);
+int  BLI_lasso_is_point_inside(const int mcords[][2], const short moves, const int sx, const int sy, const int error_value);
+int  BLI_lasso_is_edge_inside(const int mcords[][2], const short moves, int x0, int y0, int x1, int y1, const int error_value);
 
 #endif
diff --git a/source/blender/blenlib/BLI_pbvh.h b/source/blender/blenlib/BLI_pbvh.h
index 20d04f7881e..810b3b56386 100644
--- a/source/blender/blenlib/BLI_pbvh.h
+++ b/source/blender/blenlib/BLI_pbvh.h
@@ -233,7 +233,7 @@ void pbvh_vertex_iter_init(PBVH *bvh, PBVHNode *node,
 				if (vi.grid) { \
 					vi.co = CCG_elem_co(vi.key, vi.grid); \
 					vi.fno = CCG_elem_no(vi.key, vi.grid); \
-					vi.mask = CCG_elem_mask(vi.key, vi.grid); \
+					vi.mask = vi.key->has_mask ? CCG_elem_mask(vi.key, vi.grid) : NULL; \
 					vi.grid = CCG_elem_next(vi.key, vi.grid); \
 					if (vi.gh) { \
 						if (BLI_BITMAP_GET(vi.gh, vi.gy * vi.gridsize + vi.gx)) \
diff --git a/source/blender/blenlib/intern/bpath.c b/source/blender/blenlib/intern/bpath.c
index 5bafb75d9c0..bdcb3cb9806 100644
--- a/source/blender/blenlib/intern/bpath.c
+++ b/source/blender/blenlib/intern/bpath.c
@@ -552,8 +552,8 @@ void BLI_bpath_traverse_id(Main *bmain, ID *id, BPathVisitor visit_cb, const int
 		case ID_ME:
 		{
 			Mesh *me = (Mesh *)id;
-			if (me->fdata.external) {
-				rewrite_path_fixed(me->fdata.external->filename, visit_cb, absbase, bpath_user_data);
+			if (me->ldata.external) {
+				rewrite_path_fixed(me->ldata.external->filename, visit_cb, absbase, bpath_user_data);
 			}
 		}
 		break;
diff --git a/source/blender/blenlib/intern/fileops.c b/source/blender/blenlib/intern/fileops.c
index 453463beaa8..1df904f617a 100644
--- a/source/blender/blenlib/intern/fileops.c
+++ b/source/blender/blenlib/intern/fileops.c
@@ -210,6 +210,22 @@ FILE *BLI_fopen(const char *filename, const char *mode)
 	return ufopen(filename, mode);
 }
 
+void BLI_get_short_name(char short_name[256], const char *filename)
+{
+	wchar_t short_name_16[256];
+	int i = 0;
+
+	UTF16_ENCODE(filename);
+
+	GetShortPathNameW(filename_16, short_name_16, 256);
+
+	for (i = 0; i < 256; i++) {
+		short_name[i] = (char)short_name_16[i];
+	}
+
+	UTF16_UN_ENCODE(filename);
+}
+
 void *BLI_gzopen(const char *filename, const char *mode)
 {
 	gzFile gzfile;
@@ -218,25 +234,15 @@ void *BLI_gzopen(const char *filename, const char *mode)
 		return 0;
 	}
 	else {
-		wchar_t short_name_16[256];
 		char short_name[256];
-		int i = 0;
 
 		/* xxx Creates file before transcribing the path */
 		if (mode[0] == 'w')
 			fclose(ufopen(filename, "a"));
 
-		UTF16_ENCODE(filename);
-
-		GetShortPathNameW(filename_16, short_name_16, 256);
-
-		for (i = 0; i < 256; i++) {
-			short_name[i] = (char)short_name_16[i];
-		}
+		BLI_get_short_name(short_name, filename);
 
 		gzfile = gzopen(short_name, mode);
-
-		UTF16_UN_ENCODE(filename);
 	}
 
 	return gzfile;
diff --git a/source/blender/blenlib/intern/lasso.c b/source/blender/blenlib/intern/lasso.c
index 7df4da80e16..5cd8bb813a1 100644
--- a/source/blender/blenlib/intern/lasso.c
+++ b/source/blender/blenlib/intern/lasso.c
@@ -37,7 +37,7 @@
 
 #include "BLI_lasso.h" /* own include */
 
-void BLI_lasso_boundbox(rcti *rect, int mcords[][2], short moves)
+void BLI_lasso_boundbox(rcti *rect, const int mcords[][2], const short moves)
 {
 	short a;
 
@@ -53,14 +53,14 @@ void BLI_lasso_boundbox(rcti *rect, int mcords[][2], short moves)
 }
 
 
-int BLI_lasso_is_point_inside(int mcords[][2], short moves,
+int BLI_lasso_is_point_inside(const int mcords[][2], const short moves,
                               const int sx, const int sy,
                               const int error_value)
 {
 	/* we do the angle rule, define that all added angles should be about zero or (2 * PI) */
 	float angletot = 0.0, dot, ang, cross, fp1[2], fp2[2];
 	int a;
-	int *p1, *p2;
+	const int *p1, *p2;
 
 	if (sx == error_value) {
 		return 0;
@@ -100,7 +100,7 @@ int BLI_lasso_is_point_inside(int mcords[][2], short moves,
 }
 
 /* edge version for lasso select. we assume boundbox check was done */
-int BLI_lasso_is_edge_inside(int mcords[][2], short moves,
+int BLI_lasso_is_edge_inside(const int mcords[][2], const short moves,
                              int x0, int y0, int x1, int y1,
                              const int error_value)
 {
diff --git a/source/blender/blenlib/intern/math_vector_inline.c b/source/blender/blenlib/intern/math_vector_inline.c
index c409e536b45..2cfe999e032 100644
--- a/source/blender/blenlib/intern/math_vector_inline.c
+++ b/source/blender/blenlib/intern/math_vector_inline.c
@@ -689,7 +689,7 @@ MINLINE void normal_float_to_short_v3(short out[3], const float in[3])
 /********************************* Comparison ********************************/
 
 
-MINLINE int is_zero_v2(const float v[3])
+MINLINE int is_zero_v2(const float v[2])
 {
 	return (v[0] == 0 && v[1] == 0);
 }
diff --git a/source/blender/blenlib/intern/pbvh.c b/source/blender/blenlib/intern/pbvh.c
index 0bd9e68cb71..d3d8d371f60 100644
--- a/source/blender/blenlib/intern/pbvh.c
+++ b/source/blender/blenlib/intern/pbvh.c
@@ -1169,14 +1169,10 @@ static void pbvh_update_draw_buffers(PBVH *bvh, PBVHNode **nodes, int totnode)
 					break;
 				case PBVH_FACES:
 					GPU_update_mesh_buffers(node->draw_buffers,
-					                        bvh->faces,
-					                        node->prim_indices,
-					                        node->totprim,
 					                        bvh->verts,
 					                        node->vert_indices,
 					                        node->uniq_verts +
 					                        node->face_verts,
-					                        node->face_vert_indices,
 					                        CustomData_get_layer(bvh->vdata,
 					                                             CD_PAINT_MASK));
 					break;