Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Fri, 17 Feb 2017 19:03:55 +0000 (20:03 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Fri, 17 Feb 2017 19:03:55 +0000 (20:03 +0100)
Conflicts:
source/blender/editors/animation/anim_draw.c

16 files changed:
1  2 
CMakeLists.txt
release/scripts/startup/bl_ui/space_view3d.py
source/blender/alembic/intern/abc_exporter.cc
source/blender/blenkernel/BKE_object.h
source/blender/blenkernel/intern/mesh.c
source/blender/blenkernel/intern/object.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/animation/anim_draw.c
source/blender/editors/curve/editcurve.c
source/blender/editors/interface/interface_widgets.c
source/blender/editors/space_view3d/space_view3d.c
source/blender/editors/transform/transform_snap_object.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_scene.c
tests/python/CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge
index 2b83065792385bfe793f90cd8c8e266ab125d4c0,98900812bb2fa2498e5504f08d658a3a0aab8664..1d71ba8dc34d7b4e994e32a58cbd7f62b723be3e
@@@ -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);
  
Simple merge