[Bf-blender-cvs] [9e9a3cb] gooseberry: Git missed those last commit

[Antony Riakiotakis]

Commit: 9e9a3cb7b6c7a6c58997d713bf8383381788d002
Author: Antony Riakiotakis
Date:   Wed Apr 22 19:40:11 2015 +0200
Branches: gooseberry
https://developer.blender.org/rB9e9a3cb7b6c7a6c58997d713bf8383381788d002

Git missed those last commit

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

M       source/blender/editors/interface/interface_handlers.c
M       source/blender/editors/space_sequencer/sequencer_draw.c

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

diff --git a/source/blender/editors/interface/interface_handlers.c 
b/source/blender/editors/interface/interface_handlers.c
index f02101a..56e4566 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -6056,7 +6056,7 @@ static bool ui_but_menu(bContext *C, uiBut *but)
 
        but->flag |= UI_BUT_MENU_ROOT;
 
-       button_timers_tooltip_remove(C, but);
+       UI_but_tooltip_timer_remove(C, but);
 
        /* highly unlikely getting the label ever fails */
        UI_but_string_info_get(C, but, &label, NULL);
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c 
b/source/blender/editors/space_sequencer/sequencer_draw.c
index a076068..d612c17 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -1139,7 +1139,7 @@ void draw_image_seq(const bContext *C, Scene *scene, 
ARegion *ar, SpaceSeq *sseq
 
        sequencer_display_size(scene, sseq, viewrect);
 
-       if (!draw_backdrop && (sseq->mainb != SEQ_DRAW_IMG_IMBUF || sseq->zebra 
!= 0)) {
+       if (!draw_overdrop && (sseq->mainb != SEQ_DRAW_IMG_IMBUF || sseq->zebra 
!= 0)) {
                SequencerScopes *scopes = &sseq->scopes;
 
                sequencer_check_scopes(scopes, ibuf);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs