[Bf-blender-cvs] [4cf4688] temp_widgets_c++_experiment: Fix wrong argument order for widget-map update functions

[Julian Eisel]

Commit: 4cf4688c24465c41cc52d4c3f56a8403d690e531
Author: Julian Eisel
Date:   Sun Dec 20 21:46:25 2015 +0100
Branches: temp_widgets_c++_experiment
https://developer.blender.org/rB4cf4688c24465c41cc52d4c3f56a8403d690e531

Fix wrong argument order for widget-map update functions

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

M       source/blender/editors/space_graph/space_graph.c
M       source/blender/editors/space_node/node_draw.c
M       source/blender/editors/space_sequencer/sequencer_draw.c
M       source/blender/editors/space_sequencer/space_sequencer.c
M       source/blender/editors/space_view3d/view3d_draw.c

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

diff --git a/source/blender/editors/space_graph/space_graph.c 
b/source/blender/editors/space_graph/space_graph.c
index 257385f..49e1d06 100644
--- a/source/blender/editors/space_graph/space_graph.c
+++ b/source/blender/editors/space_graph/space_graph.c
@@ -360,7 +360,7 @@ static void graph_main_region_draw(const bContext *C, 
ARegion *ar)
        UI_view2d_view_restore(C);
        
        /* finally draw any widgets here */
-       WM_widgetmap_widgets_update(C, ar->widgetmaps.first);
+       WM_widgetmap_widgets_update(ar->widgetmaps.first, C);
        WM_widgetmap_widgets_draw(C, ar->widgetmaps.first, false, true);
        
        /* scrollers */
diff --git a/source/blender/editors/space_node/node_draw.c 
b/source/blender/editors/space_node/node_draw.c
index a9c2bce..f87a389 100644
--- a/source/blender/editors/space_node/node_draw.c
+++ b/source/blender/editors/space_node/node_draw.c
@@ -1366,7 +1366,7 @@ void drawnodespace(const bContext *C, ARegion *ar)
                        glaDefine2DArea(&ar->winrct);
                        wmOrtho2_pixelspace(ar->winx, ar->winy);
 
-                       WM_widgetmap_widgets_update(C, ar->widgetmaps.first);
+                       WM_widgetmap_widgets_update(ar->widgetmaps.first, C);
                        WM_widgetmap_widgets_draw(C, ar->widgetmaps.first, 
false, true);
 
                        glMatrixMode(GL_PROJECTION);
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c 
b/source/blender/editors/space_sequencer/sequencer_draw.c
index 05782ef..6075af0 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -1672,7 +1672,7 @@ void draw_timeline_seq(const bContext *C, ARegion *ar)
        UI_view2d_view_restore(C);
        
        /* finally draw any widgets here */
-       WM_widgetmap_widgets_update(C, ar->widgetmaps.first);
+       WM_widgetmap_widgets_update(ar->widgetmaps.first, C);
        WM_widgetmap_widgets_draw(C, ar->widgetmaps.first, false, true);
 
        /* scrollers */
diff --git a/source/blender/editors/space_sequencer/space_sequencer.c 
b/source/blender/editors/space_sequencer/space_sequencer.c
index dbfcd96..97f577f 100644
--- a/source/blender/editors/space_sequencer/space_sequencer.c
+++ b/source/blender/editors/space_sequencer/space_sequencer.c
@@ -605,7 +605,7 @@ static void sequencer_preview_region_draw(const bContext 
*C, ARegion *ar)
                ED_scene_draw_fps(scene, &rect);
        }
 
-       WM_widgetmap_widgets_update(C, ar->widgetmaps.first);
+       WM_widgetmap_widgets_update(ar->widgetmaps.first, C);
        WM_widgetmap_widgets_draw(C, ar->widgetmaps.first, false, true);
 }
 
diff --git a/source/blender/editors/space_view3d/view3d_draw.c 
b/source/blender/editors/space_view3d/view3d_draw.c
index 6a2aa7e..f7c96fe 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -3894,7 +3894,7 @@ static void view3d_main_region_draw_objects(const 
bContext *C, Scene *scene, Vie
        /* widgets need to be updated *after* view matrix was set up
         * XXX since we do 2 draw calls (with and without depth culling),
         * it might be better to have 2 update calls, too */
-       WM_widgetmap_widgets_update(C, ar->widgetmaps.first);
+       WM_widgetmap_widgets_update(ar->widgetmaps.first, C);
        /* draw depth culled widgets */
        WM_widgetmap_widgets_draw(C, ar->widgetmaps.first, true, false);
 
@@ -4068,7 +4068,7 @@ void view3d_main_region_draw(const bContext *C, ARegion 
*ar)
        glClear(GL_DEPTH_BUFFER_BIT);
 
        if (update_widgets) {
-               WM_widgetmap_widgets_update(C, ar->widgetmaps.first);
+               WM_widgetmap_widgets_update(ar->widgetmaps.first, C);
        }
        WM_widgetmap_widgets_draw(C, ar->widgetmaps.first, false, true);

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