Commit: 352863b13f2036c286d46b27af6e1c1c515a470b
Author: Joshua Leung
Date: Sun Aug 16 18:21:31 2015 +1200
Branches: GPencil_Editing_Stage3
https://developer.blender.org/rB352863b13f2036c286d46b27af6e1c1c515a470b
Merge branch 'master' into GPencil_Editing_Stage3
Conflicts:
source/blender/editors/space_view3d/view3d_draw.c
===================================================================
===================================================================
diff --cc source/blender/editors/space_view3d/view3d_draw.c
index e45830e,7f553fe..e8743c3
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@@ -3878,7 -3875,9 +3878,7 @@@ static void view3d_main_area_draw_info(
}
if ((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) {
- if ((U.uiflag & USER_SHOW_FPS) &&
ED_screen_animation_playing(wm)) {
- wmWindowManager *wm = CTX_wm_manager(C);
-
+ if ((U.uiflag & USER_SHOW_FPS) &&
ED_screen_animation_no_scrub(wm)) {
ED_scene_draw_fps(scene, &rect);
}
else if (U.uiflag & USER_SHOW_VIEWPORTNAME) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
