[Bf-blender-cvs] [182545c] wiggly-widgets: Create sequencer widget handlers

[Antony Riakiotakis]

Commit: 182545c8208889ace6786ebd5a2b7071fe310a96
Author: Antony Riakiotakis
Date:   Wed Dec 10 12:57:09 2014 +0100
Branches: wiggly-widgets
https://developer.blender.org/rB182545c8208889ace6786ebd5a2b7071fe310a96

Create sequencer widget handlers

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

M       source/blender/editors/space_sequencer/space_sequencer.c
M       source/blender/windowmanager/intern/wm_widgets.c

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

diff --git a/source/blender/editors/space_sequencer/space_sequencer.c 
b/source/blender/editors/space_sequencer/space_sequencer.c
index f9c348a..5b9f2a8 100644
--- a/source/blender/editors/space_sequencer/space_sequencer.c
+++ b/source/blender/editors/space_sequencer/space_sequencer.c
@@ -667,8 +667,16 @@ static void sequencer_buttons_area_listener(bScreen 
*UNUSED(sc), ScrArea *UNUSED
                        break;
        }
 }
+
 /* ************************************* */
 
+static void sequencer_widgets(void)
+{
+       /* create the widgetmap for the area here */
+       WM_widgetmaptype_find("Seq_Canvas", SPACE_SEQ, RGN_TYPE_WINDOW, false, 
true);
+}
+
+
 /* only called once, from space/spacetypes.c */
 void ED_spacetype_sequencer(void)
 {
@@ -688,6 +696,7 @@ void ED_spacetype_sequencer(void)
        st->dropboxes = sequencer_dropboxes;
        st->refresh = sequencer_refresh;
        st->listener = sequencer_listener;
+       st->widgets = sequencer_widgets;
 
        /* regions: main window */
        art = MEM_callocN(sizeof(ARegionType), "spacetype sequencer region");
diff --git a/source/blender/windowmanager/intern/wm_widgets.c 
b/source/blender/windowmanager/intern/wm_widgets.c
index d3aeaf0..62c6b2b 100644
--- a/source/blender/windowmanager/intern/wm_widgets.c
+++ b/source/blender/windowmanager/intern/wm_widgets.c
@@ -364,6 +364,11 @@ wmEventHandler *WM_event_add_widget_modal_handler(struct 
bContext *C, wmWidgetGr
 {
        wmEventHandler *handler;
        wmWindow *win;
+       
+       /* maybe overly careful, but widgetgrouptype could come from a failed 
creation */
+       if (!wgrouptype) {
+               return NULL;
+       }
 
        handler = MEM_callocN(sizeof(wmEventHandler), "widget modal handler");
        win = CTX_wm_window(C);

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