Commit: ebc899790b200231b530ba38defd8201683d6a68
Author: Joshua Leung
Date: Sat Oct 10 18:14:11 2015 +1300
Branches: blender-v2.76a-release
https://developer.blender.org/rBebc899790b200231b530ba38defd8201683d6a68
Fix: X-axis values in Graph Editor should not be displayed as timecodes in
"Drivers" mode
===================================================================
M source/blender/editors/space_graph/space_graph.c
===================================================================
diff --git a/source/blender/editors/space_graph/space_graph.c
b/source/blender/editors/space_graph/space_graph.c
index 4c7ac53..ea5cd56 100644
--- a/source/blender/editors/space_graph/space_graph.c
+++ b/source/blender/editors/space_graph/space_graph.c
@@ -240,7 +240,7 @@ static void graph_main_area_draw(const bContext *C, ARegion
*ar)
UI_view2d_view_ortho(v2d);
/* grid */
- unitx = (sipo->flag & SIPO_DRAWTIME) ? V2D_UNIT_SECONDS :
V2D_UNIT_FRAMESCALE;
+ unitx = ((sipo->mode == SIPO_MODE_ANIMATION) && (sipo->flag &
SIPO_DRAWTIME)) ? V2D_UNIT_SECONDS : V2D_UNIT_FRAMESCALE;
grid = UI_view2d_grid_calc(CTX_data_scene(C), v2d, unitx,
V2D_GRID_NOCLAMP, unity, V2D_GRID_NOCLAMP, ar->winx, ar->winy);
UI_view2d_grid_draw(v2d, grid, V2D_GRIDLINES_ALL);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
