Merged changes in the trunk up to revision 45133.

Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/bmesh/intern/bmesh_construct.c
source/blender/bmesh/intern/bmesh_mesh_conv.c
source/blender/bmesh/intern/bmesh_mesh_conv.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/resources.c
source/blender/editors/mesh/bmesh_select.c
source/blender/editors/mesh/bmesh_tools.c
source/blender/editors/space_view3d/drawobject.c
source/blender/render/intern/source/shadeoutput.c

1 files changed, 25 insertions, 25 deletions

diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 3d570252126..1f6ec45f908 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -541,7 +541,7 @@ static void drawcursor(Scene *scene, ARegion *ar, View3D *v3d)
 	int mx, my, co[2];
 	int flag;
 	
-	/* we dont want the clipping for cursor */
+	/* we don't want the clipping for cursor */
 	flag= v3d->flag;
 	v3d->flag= 0;
 	project_int(ar, give_cursor(scene, v3d), co);
@@ -956,10 +956,10 @@ static void view3d_camera_border(Scene *scene, ARegion *ar, View3D *v3d, RegionV
 	rect_camera= params.viewplane;
 
 	/* get camera border within viewport */
-	viewborder_r->xmin= ((rect_camera.xmin - rect_view.xmin)/(rect_view.xmax - rect_view.xmin))*ar->winx;
-	viewborder_r->xmax= ((rect_camera.xmax - rect_view.xmin)/(rect_view.xmax - rect_view.xmin))*ar->winx;
-	viewborder_r->ymin= ((rect_camera.ymin - rect_view.ymin)/(rect_view.ymax - rect_view.ymin))*ar->winy;
-	viewborder_r->ymax= ((rect_camera.ymax - rect_view.ymin)/(rect_view.ymax - rect_view.ymin))*ar->winy;
+	viewborder_r->xmin = ((rect_camera.xmin - rect_view.xmin)/(rect_view.xmax - rect_view.xmin))*ar->winx;
+	viewborder_r->xmax = ((rect_camera.xmax - rect_view.xmin)/(rect_view.xmax - rect_view.xmin))*ar->winx;
+	viewborder_r->ymin = ((rect_camera.ymin - rect_view.ymin)/(rect_view.ymax - rect_view.ymin))*ar->winy;
+	viewborder_r->ymax = ((rect_camera.ymax - rect_view.ymin)/(rect_view.ymax - rect_view.ymin))*ar->winy;
 }
 
 void ED_view3d_calc_camera_border_size(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D *rv3d, float size_r[2])
@@ -1236,19 +1236,19 @@ static void drawviewborder(Scene *scene, ARegion *ar, View3D *v3d)
 				float sensor_scale = (x2i-x1i) / sensor_x;
 				float sensor_height = sensor_scale * sensor_y;
 
-				rect.xmin= x1i;
-				rect.xmax= x2i;
-				rect.ymin= (y1i + y2i)*0.5f - sensor_height*0.5f;
-				rect.ymax= rect.ymin + sensor_height;
+				rect.xmin = x1i;
+				rect.xmax = x2i;
+				rect.ymin = (y1i + y2i)*0.5f - sensor_height*0.5f;
+				rect.ymax = rect.ymin + sensor_height;
 			}
 			else {
 				float sensor_scale = (y2i-y1i) / sensor_y;
 				float sensor_width = sensor_scale * sensor_x;
 
-				rect.xmin= (x1i + x2i)*0.5f - sensor_width*0.5f;
-				rect.xmax= rect.xmin + sensor_width;
-				rect.ymin= y1i;
-				rect.ymax= y2i;
+				rect.xmin = (x1i + x2i)*0.5f - sensor_width*0.5f;
+				rect.xmax = rect.xmin + sensor_width;
+				rect.ymin = y1i;
+				rect.ymax = y2i;
 			}
 
 			/* draw */
@@ -1488,7 +1488,7 @@ unsigned int view3d_sample_backbuf_rect(ViewContext *vc, const int mval[2], int
 							goto exit; 
 						}						
 					}
-					else{
+					else {
 						*dist= (short) sqrt( (float)distance ); // XXX, this distance is wrong - 
 						index = *tbuf - min+1; // messy yah, but indices start at 1
 						goto exit;
@@ -1599,7 +1599,7 @@ static void draw_bgpic(Scene *scene, ARegion *ar, View3D *v3d)
 
 				asp= ( (float)ibuf->y)/(float)ibuf->x;
 
-				vec[0] = vec[1] = vec[2] = 0.0;
+				zero_v3(vec);
 				ED_view3d_project_float_v2(ar, vec, sco, rv3d->persmat);
 				cx = sco[0];
 				cy = sco[1];
@@ -1908,10 +1908,10 @@ void view3d_update_depths_rect(ARegion *ar, ViewDepths *d, rcti *rect)
 	rcti r;
 	/* clamp rect by area */
 
-	r.xmin= 0;
-	r.xmax= ar->winx-1;
-	r.ymin= 0;
-	r.ymax= ar->winy-1;
+	r.xmin = 0;
+	r.xmax = ar->winx-1;
+	r.ymin = 0;
+	r.ymax = ar->winy-1;
 
 	/* Constrain rect to depth bounds */
 	BLI_isect_rcti(&r, rect, rect);
@@ -2097,7 +2097,7 @@ void draw_depth(Scene *scene, ARegion *ar, View3D *v3d, int (* func)(void *))
 		}
 	}
 	
-	/* this isnt that nice, draw xray objects as if they are normal */
+	/* this isn't that nice, draw xray objects as if they are normal */
 	if (	v3d->afterdraw_transp.first ||
 			v3d->afterdraw_xray.first || 
 			v3d->afterdraw_xraytransp.first
@@ -2301,7 +2301,7 @@ CustomDataMask ED_view3d_object_datamask(Scene *scene)
 		}
 
 		if (ob->mode & OB_MODE_WEIGHT_PAINT) {
-			mask |= CD_MASK_WEIGHT_MCOL;
+			mask |= CD_MASK_PREVIEW_MCOL;
 		}
 	}
 
@@ -2403,10 +2403,10 @@ void ED_view3d_draw_offscreen(Scene *scene, View3D *v3d, ARegion *ar,
 	
 	ar->winx= winx;
 	ar->winy= winy;	
-	ar->winrct.xmin= 0;
-	ar->winrct.ymin= 0;
-	ar->winrct.xmax= winx;
-	ar->winrct.ymax= winy;
+	ar->winrct.xmin = 0;
+	ar->winrct.ymin = 0;
+	ar->winrct.xmax = winx;
+	ar->winrct.ymax = winy;
 	
 	
 	/* set flags */