[Bf-blender-cvs] [2b56faebe5f] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 2b56faebe5f2a8e2b37004485206007d22cdac1d
Author: Campbell Barton
Date:   Wed Jan 10 19:58:05 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB2b56faebe5f2a8e2b37004485206007d22cdac1d

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/editors/space_view3d/drawanimviz.c
index 66355a50478,a99ac0d46a5..9fa85b55362
--- a/source/blender/editors/space_view3d/drawanimviz.c
+++ b/source/blender/editors/space_view3d/drawanimviz.c
@@@ -77,17 -76,17 +77,17 @@@ void draw_motion_paths_init(View3D *v3d
  }
  
  /* set color
- * - more intense for active/selected bones, less intense for unselected bones
- * - black for before current frame, green for current frame, blue for after current frame
- * - intensity decreases as distance from current frame increases
- *
- * If the user select custom color, the color is replaced for the color selected in UI panel
- * - 75% Darker color is used for previous frames
- * - 50% Darker color for current frame
- * - User selected color for next frames
- */
+  * - more intense for active/selected bones, less intense for unselected bones
+  * - black for before current frame, green for current frame, blue for after current frame
+  * - intensity decreases as distance from current frame increases
+  *
+  * If the user select custom color, the color is replaced for the color selected in UI panel
+  * - 75% Darker color is used for previous frames
+  * - 50% Darker color for current frame
+  * - User selected color for next frames
+  */
  static void set_motion_path_color(Scene *scene, bMotionPath *mpath, int i, short sel, int sfra, int efra,
 -	float prev_color[3], float frame_color[3], float next_color[3])
 +	float prev_color[3], float frame_color[3], float next_color[3], unsigned color)
  {
  	int frame = sfra + i;
  	int blend_base = (abs(frame - CFRA) == 1) ? TH_CFRAME : TH_BACK; /* "bleed" cframe color to ease color blending */