[Bf-blender-cvs] [ea606a7847a] blender2.8: Merge branch 'master' into blender28

[Campbell Barton]

Commit: ea606a7847a316a82b365155f666b33e81ff4c2e
Author: Campbell Barton
Date:   Fri Oct 6 21:25:33 2017 +1100
Branches: blender2.8
https://developer.blender.org/rBea606a7847a316a82b365155f666b33e81ff4c2e

Merge branch 'master' into blender28

===================================================================



===================================================================

diff --cc source/blender/editors/sculpt_paint/paint_cursor.c
index 04c7e6e2a62,5bc21457d54..befb635cfc4
--- a/source/blender/editors/sculpt_paint/paint_cursor.c
+++ b/source/blender/editors/sculpt_paint/paint_cursor.c
@@@ -1021,12 -1001,11 +1022,12 @@@ static void paint_draw_cursor(bContext 
  
  	/* can't use stroke vc here because this will be called during
  	 * mouse over too, not just during a stroke */
 +	ViewContext vc;
  	view3d_set_viewcontext(C, &vc);
  
- 	float zoomx, zoomy;
- 	get_imapaint_zoom(C, &zoomx, &zoomy);
- 	zoomx = max_ff(zoomx, zoomy);
+ 	if (vc.rv3d->rflag & RV3D_NAVIGATING) {
+ 		return;
+ 	}
  
  	/* skip everything and draw brush here */
  	if (brush->flag & BRUSH_CURVE) {
@@@ -1034,11 -1013,15 +1035,15 @@@
  		return;
  	}
  
++	float zoomx, zoomy;
+ 	get_imapaint_zoom(C, &zoomx, &zoomy);
+ 	zoomx = max_ff(zoomx, zoomy);
+ 
  	/* set various defaults */
 -	translation[0] = x;
 -	translation[1] = y;
 -	outline_alpha = 0.5;
 -	outline_col = brush->add_col;
 -	final_radius = (BKE_brush_size_get(scene, brush) * zoomx);
 +	const float *outline_col = brush->add_col;
 +	const float outline_alpha = 0.5f;
 +	float translation[2] = { x, y };
 +	float final_radius = (BKE_brush_size_get(scene, brush) * zoomx);
  
  	/* don't calculate rake angles while a stroke is active because the rake variables are global and
  	 * we may get interference with the stroke itself. For line strokes, such interference is visible */