Merge branch 'master' into blender2.8

1 files changed, 8 insertions, 8 deletions

diff --git a/source/blender/editors/space_view3d/view3d_project.c b/source/blender/editors/space_view3d/view3d_project.c
index fe14e82c152..30b91c1a8ee 100644
--- a/source/blender/editors/space_view3d/view3d_project.c
+++ b/source/blender/editors/space_view3d/view3d_project.c
@@ -57,13 +57,13 @@
 void ED_view3d_project_float_v2_m4(const ARegion *ar, const float co[3], float r_co[2], float mat[4][4])
 {
 	float vec4[4];
-	
+
 	copy_v3_v3(vec4, co);
 	vec4[3] = 1.0;
 	/* r_co[0] = IS_CLIPPED; */ /* always overwritten */
-	
+
 	mul_m4_v4(mat, vec4);
-	
+
 	if (vec4[3] > FLT_EPSILON) {
 		r_co[0] = (float)(ar->winx / 2.0f) + (ar->winx / 2.0f) * vec4[0] / vec4[3];
 		r_co[1] = (float)(ar->winy / 2.0f) + (ar->winy / 2.0f) * vec4[1] / vec4[3];
@@ -79,13 +79,13 @@ void ED_view3d_project_float_v2_m4(const ARegion *ar, const float co[3], float r
 void ED_view3d_project_float_v3_m4(const ARegion *ar, const float vec[3], float r_co[3], float mat[4][4])
 {
 	float vec4[4];
-	
+
 	copy_v3_v3(vec4, vec);
 	vec4[3] = 1.0;
 	/* r_co[0] = IS_CLIPPED; */ /* always overwritten */
-	
+
 	mul_m4_v4(mat, vec4);
-	
+
 	if (vec4[3] > FLT_EPSILON) {
 		r_co[0] = (float)(ar->winx / 2.0f) + (ar->winx / 2.0f) * vec4[0] / vec4[3];
 		r_co[1] = (float)(ar->winy / 2.0f) + (ar->winy / 2.0f) * vec4[1] / vec4[3];
@@ -551,10 +551,10 @@ void ED_view3d_win_to_delta(const ARegion *ar, const float mval[2], float out[3]
 {
 	RegionView3D *rv3d = ar->regiondata;
 	float dx, dy;
-	
+
 	dx = 2.0f * mval[0] * zfac / ar->winx;
 	dy = 2.0f * mval[1] * zfac / ar->winy;
-	
+
 	out[0] = (rv3d->persinv[0][0] * dx + rv3d->persinv[1][0] * dy);
 	out[1] = (rv3d->persinv[0][1] * dx + rv3d->persinv[1][1] * dy);
 	out[2] = (rv3d->persinv[0][2] * dx + rv3d->persinv[1][2] * dy);