[Bf-blender-cvs] [322b1d3187] blender2.8: Merge branch 'master' into blender2.8

[Bastien Montagne]

Commit: 322b1d3187fc5b3e82ebf8b13a675e3132059ef4
Author: Bastien Montagne
Date:   Fri Feb 17 20:03:55 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB322b1d3187fc5b3e82ebf8b13a675e3132059ef4

Merge branch 'master' into blender2.8

Conflicts:
	source/blender/editors/animation/anim_draw.c

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



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

diff --cc source/blender/editors/animation/anim_draw.c
index 2b83065792,98900812bb..1d71ba8dc3
--- a/source/blender/editors/animation/anim_draw.c
+++ b/source/blender/editors/animation/anim_draw.c
@@@ -121,7 -114,11 +123,8 @@@ void ANIM_draw_cfra(const bContext *C, 
  {
  	Scene *scene = CTX_data_scene(C);
  
- 	const float x = (float)(scene->r.cfra * scene->r.framelen);
 -	/* Draw a light green line to indicate current frame */
 -	UI_ThemeColor(TH_CFRAME);
 -
+ 	const float time = scene->r.cfra + scene->r.subframe;
+ 	const float x = (float)(time * scene->r.framelen);
  
  	glLineWidth((flag & DRAWCFRA_WIDE) ? 3.0 : 2.0);